From 6e6e2ec70df30d0879570d242f343db257188cc3 Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Wed, 21 Feb 2024 11:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E6=94=B6=E9=93=B6=E5=91=97=E5=AD=97?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=BD=AC=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/encodings.xml                                           | 1 +
 .idea/misc.xml                                                | 4 ++++
 .../cn/pluss/platform/ryx/impl/RyxSfbPluginServiceImpl.java   | 4 ++--
 pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/index.jsp | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 4634a2e..1af9fe9 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -13,6 +13,7 @@
     <file url="file://$PROJECT_DIR$/pluss-model-bundle/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/pluss-model-bundle/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/pluss-service-bundle/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/pluss-service-bundle/src/main/java/cn/pluss/platform/ali/impl/AlipayServiceImpl.java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/pluss-service-bundle/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/pluss-wap-page/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/pluss-wap-page/src/main/resources" charset="UTF-8" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b784bbc..292bb8f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ASMSmaliIdeaPluginConfiguration">
+    <asm skipDebug="true" skipFrames="true" skipCode="false" expandFrames="false" />
+    <groovy codeStyle="LEGACY" />
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxSfbPluginServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxSfbPluginServiceImpl.java
index d3cdbb3..557e449 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxSfbPluginServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxSfbPluginServiceImpl.java
@@ -149,7 +149,7 @@ package cn.pluss.platform.ryx.impl;
 //            String posMerId = result.getString("posMerId");
 //            merchantPlugin.setPosMerId(posMerId);
 //            merchantPluginService.updateById(merchantPlugin);
-//            sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", "商户插件审核通过", applicationId + "_" + ryxAccessModel.getReqTime());
+//            sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", "商户插件审核通过", applicationId + "_" + ryxAccessModel.getReqTime());
 //        }
 //
 //        if ("4".equals(taskStatus)) {
@@ -157,7 +157,7 @@ package cn.pluss.platform.ryx.impl;
 //            merchantPlugin.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
 //            merchantPlugin.setRemark(remark);
 //            merchantPluginService.updateById(merchantPlugin);
-//            sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", remark, applicationId + "_" + ryxAccessModel.getReqTime());
+//            sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", remark, applicationId + "_" + ryxAccessModel.getReqTime());
 //        }
 //
 //        MerchantAuditRecord lastRecord = auditRecordService.getLastRecord(userApp.getMerchantCode());
diff --git a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/index.jsp b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/index.jsp
index 1fa79f9..a02e8a3 100644
--- a/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/index.jsp
+++ b/pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/index.jsp
@@ -267,7 +267,7 @@
 		<!--自己放loding图片-->
 	</div>
 	<!-- <div class="page-title tcenter h40 bluebg white">
-            <span>收银呗</span>
+            <span>银收客</span>
         </div> -->
 	<div class="logo" style="margin: 10px;">
 		<img src="https://www.shouyinbei.net/resources/images/syblogo.png" />