From 8531da830c0b0716105d12680c1b692078061874 Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Wed, 21 Jun 2023 17:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E7=9B=9B=E5=A4=A7=E6=94=B9=E8=BF=9B?=
 =?UTF-8?q?=E4=BB=B6=E5=AE=8C=E6=88=90=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=93=B6?=
 =?UTF-8?q?=E7=9B=9B=E8=BF=9B=E4=BB=B6=E4=B8=8D=E6=88=90=E5=8A=9F=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/channel/ys/impl/YSAuditServiceV3.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java
index f1a8530..b3548b8 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java
@@ -732,7 +732,9 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
                     mcs.getExtra().put("mercCnm", mbi.getBussAuthName());
                 }
                 mcsService.updateById(mcs);
-                openOnlinePay(mcs);
+                if (channel == 4) {
+                    openOnlinePay(mcs);
+                }
                 //暂时用手动进件
 //                mercAuditListener.onSuccess(mbi.getUserId(), mcs);
                 //向小程序里加入商家
@@ -746,6 +748,12 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
                 break;
                 //TODO 失败和错误时没有处理
             case YsConfigV3.STATUS_REFUSE:
+                String note1 = authData.getNote();
+                mcs.setRemark(note1);
+                mcs.setStatus(MerchantChannelStatus.AUDIT_STATUS_REJECT);
+                mcsService.updateById(mcs);
+                mercAuditListener.onFail(mbi.getUserId(), mcs, note1);
+                break;
             case YsConfigV3.STATUS_SIGN_REFUSE:
                 List<String> excludeStatus = Arrays.asList(MerchantChannelStatus.AUDIT_STATUS_REJECT, MerchantChannelStatus.AUDIT_STATUS_SUCCESS);
                 MerchantChannelStatus finalMcs = mcs;
@@ -815,8 +823,6 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer
             JSONObject param = new JSONObject();
             param.put(YsConstant.MERC_ID, mcs.getMerchantId());
             param.put("option", "ON");
-            param.put("rateFee", "0.38");
-            param.put("rateBottom", "1");
             ysServiceV3.req(ReqMethod.openOnlinePay, param, mcs.getChannel());
         } catch (Exception e) {
             log.error("云商服3.0开通线上D0接口报错: {}", e.getMessage());