From c10814f3da49eed4facaf686caf844a128156cde Mon Sep 17 00:00:00 2001
From: zhujunshuai <602228920@qq.com>
Date: Thu, 16 Mar 2023 18:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E6=88=B7=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchantProfit/impl/MerchantProfitServiceImpl.java         | 1 +
 .../java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java     | 3 +++
 .../main/java/cn/pluss/platform/task/BaseMerAuditHandler.java  | 2 +-
 .../main/java/cn/pluss/platform/task/SxfMerAuditHandler.java   | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java
index 4c31c57..d0d08e4 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java
@@ -119,6 +119,7 @@ public class MerchantProfitServiceImpl extends ServiceImpl<MerchantProfitMapper,
     /**
      * 计算分润开始
      * @date: 2022/1/21 15:29
+     *
      * @param userApp:
      * @param orderType:
      */
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 3788296..d720058 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
@@ -408,6 +408,9 @@ public class ApiPayServiceImpl implements ApiPayService {
                     result.put("mercOrderNo",order.getMercOrderNo());
                     result.put("orderNumber",order.getOrderNumber());
                     result.put("payAmt",order.getConsumeFee().toString());
+
+                    System.out.println("下单测试");
+
                     return ResultGenerator.genSuccessJsonResult("下单成功", result);
                 }
                 if (channel.getChannel() == 1) {
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java
index 9e0087f..ad0b888 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java
@@ -120,7 +120,7 @@ public abstract class BaseMerAuditHandler<T extends IMerAuditHandler> implements
             QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
                     .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
             MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
-            String baseUrl = "https://shop.shouyinbei.net/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            String baseUrl = "https://ky.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
             StringBuffer sb = new StringBuffer(baseUrl);
             sb.append("&title=").append(merchantBaseInfo.getAlias());
             sb.append("&password=").append(userInfo.getPassword().toLowerCase());
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
index 8ab18fd..1c435b2 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java
@@ -350,7 +350,7 @@ public class SxfMerAuditHandler {
             QueryWrapper<MerchantImage> queryWrapper = new QueryWrapper<MerchantImage>()
                     .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06");
             MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper);
-            String baseUrl = "https://shop.shouyinbei.net/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
+            String baseUrl = "https://ky.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1";
             StringBuilder sb = new StringBuilder(baseUrl);
             sb.append("&title=").append(merchantBaseInfo.getAlias());
             sb.append("&password=").append(userInfo.getPassword().toLowerCase());