修改了百城千团校验机制, 计奖交易-我的业绩接口已完成,商户统计(未完成)

kxs-stat/kxs-stat-api/src/main/java/com/kxs/stat/api/vo/statUser/TimeVO.java

@@ -16,6 +16,6 @@ public class TimeVO {
     /**
      * 激活品牌分组集合
      */
-    private List<activityAddVO> activityAdd;
+    private List<ActivityAddVO> activityAdd;
 
 }

kxs-stat/kxs-stat-biz/src/main/java/com/kxs/stat/biz/service/impl/KxsUserActTradeServiceImpl.java

@@ -1,5 +1,4 @@
 package com.kxs.stat.biz.service.impl;
-import java.math.BigDecimal;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
@@ -9,17 +8,13 @@ import com.kxs.common.core.util.AssertUtil;
 import com.kxs.common.core.util.R;
 import com.kxs.stat.api.dto.statUser.GetActivityStatByIdAndTimeDTO;
 import com.kxs.stat.api.vo.GetActivityStatByIdAndTimeVO;
-import com.kxs.stat.api.vo.statUser.TimeVO;
-import com.kxs.stat.api.vo.statUser.TimesVO;
-import com.kxs.stat.api.vo.statUser.TrendTimesVO;
-import com.kxs.stat.api.vo.statUser.TrendVO;
+import com.kxs.stat.api.vo.statUser.*;
 import com.kxs.stat.biz.mapper.KxsUserActTradeMapper;
 import com.kxs.stat.api.model.KxsUserActTrade;
 import com.kxs.stat.biz.service.KxsUserActTradeService;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -83,21 +78,17 @@ public class KxsUserActTradeServiceImpl extends ServiceImpl<KxsUserActTradeMappe
             // todo  暂停
             //构造数据
             //将全部交易额以及品牌交易额构造进入map  key为品牌id  或  all
-//            ArrayList<TimeVO> allTimeVOS = new ArrayList<>();
-//            Map<String,List<TimeVO>> treadTrend = new HashMap<>();
+//            ArrayList<ActivityAddVO> activityAddVOS = new ArrayList<>();
+//            Map<String,List<ActivityAddVO>> treadTrend = new HashMap<>();
 //            for (TrendTimesVO trendTimesVO : trendTimesVOS) {
-//                String time = trendTimesVO.getTime();
-//                BigDecimal amount = trendTimesVO.getAmount();
 //                Integer total = trendTimesVO.getTotal();
 //                Integer brandId = trendTimesVO.getBrandId();
-//
-//
-//                TimeVO timeVO = new TimeVO();
-//                timeVO.setDate(time);
-//                timeVO.setActivityAdd();
-//
-//                allTimeVOS.add(timeVO);
+//                ActivityAddVO activityAddVO = new ActivityAddVO();
+//                activityAddVO.setName(String.valueOf(brandId));
+//                activityAddVO.setTotal(total);
+//                activityAddVOS.add(activityAddVO);
 //            }
+//            treadTrend.put("all",activityAddVOS);
 //            treadTrend.put("all", allTimeVOS);
 //
 //            for (TrendTimesVO trendTimesVO : trendTimesVOListBrand) {