From 12eb6f7b5bc2045201a0a3bef329f1ca71a12153 Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Wed, 30 Aug 2023 09:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=8D=E6=89=AB=E5=88=86?=
 =?UTF-8?q?=E6=B6=A6=EF=BC=8C=E4=BC=98=E5=8C=96ordertest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MerchantOrderController.java   | 20 ++++++++++++-------
 .../impl/MerchantOrderServiceImpl.java        |  6 ++++++
 .../audit/SxfMerchantAuditServiceImpl.java    |  1 +
 .../userApp/impl/UserAppServiceImpl.java      |  2 +-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
index 2b7ddb9..dd75a31 100644
--- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
@@ -557,7 +557,13 @@ public class MerchantOrderController {
         merchantOrder.setTransDt(new Date());
         merchantOrder.setCreateDt(new Date());
         merchantOrder.setStatus("1");
-        merchantOrder.setEnterFee(merchantOrder.getConsumeFee()-(merchantOrder.getConsumeFee()*0.0038));
+        //BigDecimal e=new BigDecimal(merchantOrder.getConsumeFee()).subtract(new BigDecimal(merchantOrder.getConsumeFee()).multiply(new BigDecimal("0.0038")).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN);
+
+        BigDecimal bigDecimal = new BigDecimal(merchantOrder.getConsumeFee()).multiply(new BigDecimal("0.0038")).setScale(2, BigDecimal.ROUND_DOWN);
+        BigDecimal subtract = new BigDecimal(merchantOrder.getConsumeFee()).subtract(bigDecimal);
+        BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(merchantOrder.getConsumeFee()));
+        BigDecimal subtract1 = bigDecimal1.subtract(bigDecimal);
+        merchantOrder.setEnterFee(subtract1.doubleValue());
         merchantOrder.setAisleSwitch("0");
         merchantOrder.setRate(new BigDecimal("38.00"));
         merchantOrder.setSettlementType(1);
@@ -578,12 +584,12 @@ public class MerchantOrderController {
     }
 
     public static void main(String[] args) {
-        Double a = 1000.00D;
-        Double s = 0.0038;
-        double v = a * s;
-        System.out.println("利率"+v);
-        double v1 = a - (a * s);
-        System.out.println("剩余"+v1);
+        BigDecimal s = new BigDecimal("0.0038");
+        BigDecimal a = new BigDecimal("77.77");
+        BigDecimal multiply = s.multiply(a).setScale(2,BigDecimal.ROUND_DOWN);
+        BigDecimal bigDecimal = a.subtract(multiply).setScale(2, BigDecimal.ROUND_DOWN);
+        System.out.println(multiply);
+        System.out.println(bigDecimal);
     }
 
     /**
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
index c2d81d2..2d11bbc 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.crypto.SecureUtil;
 import cn.hutool.json.JSONUtil;
 import cn.pluss.platform.IdCardService;
 import cn.pluss.platform.PushService;
+import cn.pluss.platform.UserMakerQuota.UserMakerQuotaService;
 import cn.pluss.platform.activityConsumReturn.ActivityConsumReturnService;
 import cn.pluss.platform.activityRecharge.ActivityRechargeService;
 import cn.pluss.platform.api.PageInfo;
@@ -225,6 +226,8 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
 
     @Resource
     private MerchantOrderSplitService merchantOrderSplitService;
+    @Resource
+    private UserMakerQuotaService userMakerQuotaService;
 
 
     @Override
@@ -1239,9 +1242,12 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
             try {
                 merchantProfitService.createOrderProfitV2(order,"1");
                 log.info("【主扫支付】插入分润成功，订单号:{}",order.getOrderNumber());
+            //若是小微创客增加额度
+                userMakerQuotaService.quotaInfo(order);
             }catch (Exception e){
                 log.error("【主扫支付】插入分润异常，订单号:{}，异常信息:{}",order.getOrderNumber(),e.getMessage());
             }
+
             this.baseMapper.updateById(order);
             //添加积分记录
             //TODO 添加判断是否满足条件返积分
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java
index 619eeb0..d209292 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/sxf/audit/SxfMerchantAuditServiceImpl.java
@@ -232,6 +232,7 @@ public class SxfMerchantAuditServiceImpl extends BaseMerchantAuditService {
         // step 1、组合请求数据
         reqData.putAll(getMerchantAuditInfo(userId, merchantBaseInfo, mcs));
         reqData.put("callbackUrl", ParametersUtil.domain + "/api/auditCallback/sxf");
+        reqData.put("specifyALiPayChannel", "2088441721243954");
 
 
 
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java
index 3c70513..c76b0ee 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java
@@ -802,7 +802,7 @@ public class UserAppServiceImpl extends ServiceImpl<UserAppMapper, UserApp> impl
                 break;
             case "4":
                 // 银盛
-                //ysAuditServiceV2.merchantAudit(userId, false);
+                //ysAuditServiceV2.merchantAudiRt(userId, false);
                 ysAuditServiceV3.merchantAuditV3(userId, false, 4);
                 break;
             case "5":