From 7e96155e8dd4607a11f6edf793b998941b8953aa Mon Sep 17 00:00:00 2001
From: zhujunshuai <602228920@qq.com>
Date: Tue, 18 Apr 2023 10:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=95=86=E5=9F=8E=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/pluss/platform/constants/Constant.java   | 2 +-
 .../platform/device/impl/MercOrderNewServiceImpl.java     | 8 ++++++--
 .../cn/pluss/platform/pay/impl/ApiPayServiceImpl.java     | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java
index cad1ef1..9652536 100644
--- a/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java
+++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/constants/Constant.java
@@ -161,7 +161,7 @@ public class Constant {
     /**
      * 默认通道
      */
-    public static final Integer DEFAULT_CHANNEL = 4;
+    public static final Integer DEFAULT_CHANNEL = 1;
 
     /**
      * 支付宝H5支付前缀
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java
index c910aa5..e1e3bcb 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderNewServiceImpl.java
@@ -16,6 +16,7 @@ import cn.pluss.platform.mapper.*;
 import cn.pluss.platform.openAccount.OpenAccountRecordService;
 import cn.pluss.platform.pay.PayService;
 import cn.pluss.platform.postageConfig.PostageConfigService;
+import cn.pluss.platform.sxf.pay.SxfPayService;
 import cn.pluss.platform.systemConfig.SystemConfigService;
 import cn.pluss.platform.userAddress.UserAddressService;
 import cn.pluss.platform.userApp.UserAppService;
@@ -108,6 +109,9 @@ public class MercOrderNewServiceImpl extends ServiceImpl<MercOrderNewMapper, Mer
     @Resource
     private MerchantStoreMapper merchantStoreMapper;
 
+    @Resource
+    private SxfPayService sxfPayService;
+
     /**
      * 设备订单分页查询
      *
@@ -446,13 +450,13 @@ public class MercOrderNewServiceImpl extends ServiceImpl<MercOrderNewMapper, Mer
         Integer channel = order.getChannel();
         MsgException.checkNull(channel, "未知通道");
         switch (channel) {
-            case 4:
+            case 1:
                 //银盛通道
                 MerchantChannelStatus channelStatus = mcsMapper.getByMerchantCode(order.getMerchantCode(), channel);
                 MsgException.checkNull(channelStatus, "当前通道信息异常！");
                 MerchantOrder mo = new MerchantOrder();
                 order.convert(mo, null);
-                JSONObject resp = ysPayOldService.tradeQuery(mo, channelStatus.getMerchantId());
+                JSONObject resp = sxfPayService.tradeQuery(mo, channelStatus.getMerchantId());
                 if (ResultCode.FAIL.code() == resp.getIntValue("code")) {
                     MsgException.throwException("查询失败：失败原因:" + resp.getString("msg"));
                 }
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java
index 762e7a9..4c012d9 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java
@@ -700,7 +700,8 @@ public class ApiPayServiceImpl implements ApiPayService {
                 order.setMercUserId(userId);
                 order.setAlias(merchant.getMerchantName());
                 try {
-                    JSONObject result = ysPayOldService.tradePay(order, channel,merchant);
+                    JSONObject result = sxfPayService.tradePay(order, channel,merchant);
+
                     if(ResultCode.SUCCESS.code() != result.getInteger("code")){
                         return ResultGenerator.genFailResult(result.getString("msg"));
                     }