Pārlūkot izejas kodu

fix 手动转账数据改为支付宝转账数据

zoujiajian 2 gadi atpakaļ
vecāks
revīzija
a808d8a492

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/excel/ExcelMonthlyDistributeOrderData.java

@@ -54,7 +54,7 @@ public class ExcelMonthlyDistributeOrderData {
 	@ExcelProperty({"分销提现数据", "usdt转账金额"})
 	private BigDecimal usdtMoney;
 
-	@ExcelProperty({"分销提现数据", "手动转账金额"})
+	@ExcelProperty({"分销提现数据", "支付宝手动转账金额"})
 	private BigDecimal manualMoney;
 
 	@ExcelProperty({"下单率","自然流量渠道","自然渠道用户数"})

+ 1 - 1
netflix-dao/src/main/resources/mapper/StatisticsExportMapper.xml

@@ -452,7 +452,7 @@
     <select id="getTransferData" resultType="java.util.Map">
         select sum(if(money &lt;= 40000, money, 0)) autoMoney,
                sum(if(type = 'usdt', money, 0))     usdtMoney,
-               sum(if(money > 40000, money, 0))     manualMoney
+               sum(if(money > 40000 and type != 'usdt', money, 0))     manualMoney
         from distribute_money_apply
         where created_time >= #{startDate}
           and created_time &lt; #{endDate}