czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

把收银呗字全部转化

Browse Source
This commit is contained in:
liuyingfang
2024-02-21 11:47:05 +08:00
parent e2aa4e954f
commit 6e6e2ec70d
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/encodings.xml generated
View File

@@ -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/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pluss-model-bundle/src/main/resources" 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" 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-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/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/pluss-wap-page/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/pluss-wap-page/src/main/resources" charset="UTF-8" />

4
.idea/misc.xml generated
View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <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="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager"> <component name="MavenProjectsManager">
<option name="originalFiles"> <option name="originalFiles">

4
pluss-service-bundle/src/main/java/cn/pluss/platform/ryx/impl/RyxSfbPluginServiceImpl.java
View File

@@ -149,7 +149,7 @@ package cn.pluss.platform.ryx.impl;
// String posMerId = result.getString("posMerId"); // String posMerId = result.getString("posMerId");
// merchantPlugin.setPosMerId(posMerId); // merchantPlugin.setPosMerId(posMerId);
// merchantPluginService.updateById(merchantPlugin); // merchantPluginService.updateById(merchantPlugin);
// sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", "商户插件审核通过", applicationId + "_" + ryxAccessModel.getReqTime()); // sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", "商户插件审核通过", applicationId + "_" + ryxAccessModel.getReqTime());
// } // }
// //
// if ("4".equals(taskStatus)) { // if ("4".equals(taskStatus)) {
@@ -157,7 +157,7 @@ package cn.pluss.platform.ryx.impl;
// merchantPlugin.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT); // merchantPlugin.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
// merchantPlugin.setRemark(remark); // merchantPlugin.setRemark(remark);
// merchantPluginService.updateById(merchantPlugin); // merchantPluginService.updateById(merchantPlugin);
// sxfMerAuditHandler.sendNotice(userApp, "收银呗审核通知", remark, applicationId + "_" + ryxAccessModel.getReqTime()); // sxfMerAuditHandler.sendNotice(userApp, "银收客审核通知", remark, applicationId + "_" + ryxAccessModel.getReqTime());
// } // }
// //
// MerchantAuditRecord lastRecord = auditRecordService.getLastRecord(userApp.getMerchantCode()); // MerchantAuditRecord lastRecord = auditRecordService.getLastRecord(userApp.getMerchantCode());

2
pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/index.jsp
View File

@@ -267,7 +267,7 @@
<!--自己放loding图片--> <!--自己放loding图片-->
</div> </div>
<!-- <div class="page-title tcenter h40 bluebg white"> <!-- <div class="page-title tcenter h40 bluebg white">
<span>收银呗</span> <span>银收客</span>
</div> --> </div> -->
<div class="logo" style="margin: 10px;"> <div class="logo" style="margin: 10px;">
<img src="https://www.shouyinbei.net/resources/images/syblogo.png" /> <img src="https://www.shouyinbei.net/resources/images/syblogo.png" />