Explorar o código

fix appleOne分销金额除以100

zoujiajian %!s(int64=3) %!d(string=hai) anos
pai
achega
585d8cb872

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

@@ -13,7 +13,7 @@
         sum(num_of_year_order) as num_of_year_order,
         sum(num_of_year_order) as num_of_year_order,
         sum(num_of_code_order) as num_of_code_order,
         sum(num_of_code_order) as num_of_code_order,
         sum(num_of_distribute_order) as numOfDistributeOrder,
         sum(num_of_distribute_order) as numOfDistributeOrder,
-        sum(distribute_order_money) as distributeOrderMoney
+        cast(sum(distribute_order_money)/100 as decimal(20,2)) as distributeOrderMoney
         from `apple_one_data`
         from `apple_one_data`
         <where>
         <where>
             <if test="startDate != null">
             <if test="startDate != null">

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

@@ -436,7 +436,6 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 
 
 
 
 	private void getAppleOneDataView(BackgroundDataView backgroundDataView, Date startDate, Date endDate) {
 	private void getAppleOneDataView(BackgroundDataView backgroundDataView, Date startDate, Date endDate) {
-		List<AppleOneData> appleOneData = appleOneDataMapper.statisticsAppleOneData(startDate, endDate);
 		if (DateUtil.beginOfDay(DateTime.now()).equals(startDate) && DateUtil.beginOfDay(DateUtil.offsetDay(DateTime.now(), 1)).equals(endDate)) {
 		if (DateUtil.beginOfDay(DateTime.now()).equals(startDate) && DateUtil.beginOfDay(DateUtil.offsetDay(DateTime.now(), 1)).equals(endDate)) {
 			List<AppleOneData> appleOneData1 = statistics.statisticsAppleOneData(startDate, endDate, true);
 			List<AppleOneData> appleOneData1 = statistics.statisticsAppleOneData(startDate, endDate, true);
 			List<AppleOneData> collect = appleOneData1.stream().filter(data -> {
 			List<AppleOneData> collect = appleOneData1.stream().filter(data -> {
@@ -450,6 +449,7 @@ public class StatisticsDataServiceImpl implements StatisticsDataService {
 			}).collect(Collectors.toList());
 			}).collect(Collectors.toList());
 			backgroundDataView.setAppleOneDataViews(collect);
 			backgroundDataView.setAppleOneDataViews(collect);
 		} else {
 		} else {
+			List<AppleOneData> appleOneData = appleOneDataMapper.statisticsAppleOneData(startDate, endDate);
 			appleOneData.forEach(data -> {
 			appleOneData.forEach(data -> {
 				data.setRefundMoney(getAppleOneRefundMoneyByArea(data.getAreaName(), startDate, endDate));
 				data.setRefundMoney(getAppleOneRefundMoneyByArea(data.getAreaName(), startDate, endDate));
 			});
 			});