From 994eb1a754197ed8ca27576eb1a5e336145abef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Fri, 21 Jul 2023 19:25:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/pluss/platform/mapper/MerchantOrderMapper.java | 1 +
 .../cn/pluss/platform/mapper/MerchantProfitMapper.java     | 2 +-
 .../src/main/resources/mapper/MerchantProfit-sqlmap.xml    | 7 +------
 .../platform/app/impl/PromoterMainPageServiceImpl.java     | 5 +++++
 .../merchantProfit/impl/MerchantProfitServiceImpl.java     | 3 ++-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java
index 561f590..9731acf 100644
--- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantOrderMapper.java
@@ -427,5 +427,6 @@ public interface MerchantOrderMapper extends BaseMapper<MerchantOrder> {
 
 	@Select("SELECT * FROM tb_pluss_merchant_order WHERE mercOrderNo = #{mercOrderNo} limit 1")
     MerchantOrder getByMercOrderNo(String mercOrderNo);
+
 }
 
diff --git a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantProfitMapper.java b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantProfitMapper.java
index 34736a9..7e59177 100644
--- a/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantProfitMapper.java
+++ b/pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantProfitMapper.java
@@ -17,7 +17,7 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
 
     List<MerchantProfit> selectGroupMercProfit(@Param("userIdList") List<Long> userIdList);
 
-    @Select("SELECT SUM(`price`) FROM tb_pluss_merchant_profit WHERE `status` = '1' AND userId = #{userId}")
+    @Select("SELECT SUM(`price`) FROM tb_pluss_merchant_profit WHERE `status` = '5' AND userId = #{userId}")
     BigDecimal selectSumValidProfit(@Param("userId") String userId);
 
     MerchantProfit queryMerchantProfit(MerchantProfit merchantProfit);
diff --git a/pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml b/pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml
index e1aff49..20fdcca 100644
--- a/pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml
+++ b/pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml
@@ -554,8 +554,7 @@
 
 
     <select id="queryMerchantProfitSumPrice" parameterType="java.util.Map" resultType="java.lang.Double">
-        SELECT sum(price) from tb_pluss_merchant_profit profit
-        <where>
+        SELECT sum(price) from tb_pluss_merchant_profit profit where profit.type=5
             <if test="id!= null">
                 and profit.id = #{id}
             </if>
@@ -646,9 +645,6 @@
             <if test="merchantParentPhone!= null">
                 and profit.merchantParentPhone = #{merchantParentPhone}
             </if>
-            <if test="retype!= null">
-                and profit.type !=4
-            </if>
             <if test="recordDate != null">
                 and profit.recordDate = #{recordDate}
             </if>
@@ -658,7 +654,6 @@
             <if test="recordDateEnd != null">
                 and profit.recordDate &lt;= #{recordDateEnd}
             </if>
-        </where>
     </select>
 
 
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/PromoterMainPageServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/PromoterMainPageServiceImpl.java
index a6889fa..55fef90 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/PromoterMainPageServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/PromoterMainPageServiceImpl.java
@@ -5,6 +5,8 @@ import cn.pluss.platform.app.MainPageService;
 import cn.pluss.platform.entity.MerchantOrderStatistics;
 import cn.pluss.platform.entity.UserApp;
 import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantOrderMapper;
+import cn.pluss.platform.merchantOrder.MerchantOrderService;
 import cn.pluss.platform.merchantOrder.MerchantOrderStatisticsService;
 import cn.pluss.platform.merchantProfit.MerchantProfitService;
 import cn.pluss.platform.userApp.UserAppService;
@@ -37,6 +39,9 @@ public class PromoterMainPageServiceImpl implements MainPageService {
     @Lazy
     private MerchantOrderStatisticsService mosService;
 
+    @Autowired
+    private MerchantOrderMapper merchantOrderMapper;
+
     @Override
     public Map<String, Object> getSpreadData(String userId) {
         Map<String, Object> resultMap = new HashMap<>();
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 ffe07d5..a321761 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
@@ -204,6 +204,7 @@ public class MerchantProfitServiceImpl extends ServiceImpl<MerchantProfitMapper,
                     log.error("订单号:{},分润结束，获取分润数为:{}",order.getOrderNumber(),profits.size());
                     return;
                 }
+                log.info("userId:{},rate:{},amount:{}",nowUserApp.getUserId(),profitRate,order.getConsumeFee());
 
                 BigDecimal profitAmt = profitRate.divide(BigDecimal.valueOf(100)).multiply(BigDecimal.valueOf(order.getConsumeFee())).setScale(4, BigDecimal.ROUND_DOWN);
                 MerchantProfit profit = new MerchantProfit(nowUserApp, nowUserApp, order, profitAmt, profitRate, "5", "1");
@@ -231,7 +232,7 @@ public class MerchantProfitServiceImpl extends ServiceImpl<MerchantProfitMapper,
                 log.error("订单号:{},分润结束，获取分润数为:{}",order.getOrderNumber(),profits.size());
                 return;
             }
-
+            log.info("userId:{},rate:{},amount:{}",nowUserApp.getUserId(),profitRate,order.getConsumeFee());
             BigDecimal profitAmt = profitRate.divide(BigDecimal.valueOf(100)).multiply(BigDecimal.valueOf(order.getConsumeFee())).setScale(4, BigDecimal.ROUND_DOWN);
             MerchantProfit profit = new MerchantProfit(nowUserApp,nowUserApp , order, profitAmt, profitRate, "5", "1");
             profits.add(profit);