每月数据导出增加分销转账数据

netflix-dao/src/main/java/com/cyksj/mapper/manage/statistics/StatisticsExportMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /*
@@ -65,4 +66,6 @@ public interface StatisticsExportMapper{
 	ExcelAppleOneData getAppleOneDataThisMonth(@Param("skuIds") Set<Long> skuIds, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
 	Integer getAppleOnePayMonthTypeOrderThisMonth(@Param("skuId") Long skuId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+	Map<String, BigDecimal> getTransferData(@Param("startDate") String startDate, @Param("endDate") String endDate);
 }

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

@@ -48,6 +48,15 @@ public class ExcelMonthlyDistributeOrderData {
 	@ExcelProperty({"分销提现数据","累计实际提现"})
 	private BigDecimal realApplyMoney;
 
+	@ExcelProperty({"分销提现数据", "自动转账金额"})
+	private BigDecimal autoMoney;
+
+	@ExcelProperty({"分销提现数据", "usdt转账金额"})
+	private BigDecimal usdtMoney;
+
+	@ExcelProperty({"分销提现数据", "手动转账金额"})
+	private BigDecimal manualMoney;
+
 	@ExcelProperty({"下单率","自然流量渠道","自然渠道用户数"})
 	private Integer natureUserSourceNum;
 

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

@@ -429,4 +429,14 @@
             and created_time < #{endDate}
         </if>
     </select>
+
+    <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
+        from distribute_money_apply
+        where created_time >= #{startDate}
+          and created_time &lt; #{endDate}
+          and verify_status = 'success'
+    </select>
 </mapper>

netflix-service/src/main/java/com/cyksj/service/mange/statistics/impl/StatisticsDataServiceImpl.java

@@ -547,6 +547,15 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 		BigDecimal realApplyMoney = statisticsExportMapper.getRealApplyMoney(endDate);
 		excelMonthlyDistributeOrderData.setRealApplyMoney(realApplyMoney);
 
+		//分销转账数据
+		Map<String, BigDecimal> transferDataMap = statisticsExportMapper.getTransferData(startDate, endDate);
+		BigDecimal autoMoney = Optional.ofNullable(transferDataMap.get("autoMoney")).orElse(BigDecimal.ZERO).divide(BigDecimal.valueOf(100));
+		BigDecimal usdtMoney = Optional.ofNullable(transferDataMap.get("usdtMoney")).orElse(BigDecimal.ZERO).divide(BigDecimal.valueOf(100));
+		BigDecimal manualMoney = Optional.ofNullable(transferDataMap.get("manualMoney")).orElse(BigDecimal.ZERO).divide(BigDecimal.valueOf(100));
+		excelMonthlyDistributeOrderData.setAutoMoney(autoMoney);
+		excelMonthlyDistributeOrderData.setUsdtMoney(usdtMoney);
+		excelMonthlyDistributeOrderData.setManualMoney(manualMoney);
+
 		//下单率
 		//自然渠道用户数
 		Integer natureUserSourceNum = statisticsExportMapper.getMonthUserSourceNumByType(1, startDate, endDate);