返回活动标题信息

yujian

2020-05-22 739462e2618b0b7d19a14d335a768d5829739819

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java

@@ -778,11 +778,11 @@
            minDay = TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(date));

            maxDay = TimeUtil.parseYYYYMMDD_HHMMSS(DateUtil.getLastDayOfMonth(date) + " 23:59:59");

         }

         List<TeamDividentsVO> list = teamDividentsSourceOrderUserMapService.listByDateAndTargetUid((page-1) * pageSize, pageSize, uid, minDay, maxDay);

         List<TeamDividentsVO> list = teamDividentsSourceOrderUserMapService.listByDateAndTargetUid((page-1) * pageSize, pageSize, uid, minDay, maxDay, key);

         if (list == null) {

            list = new ArrayList<>();

         }

         long count = teamDividentsSourceOrderUserMapService.countByDateAndTargetUid(uid, minDay, maxDay);

         long count = teamDividentsSourceOrderUserMapService.countByDateAndTargetUid(uid, minDay, maxDay, key);

         

         GsonBuilder builder = new GsonBuilder();

         builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {

@@ -802,7 +802,7 @@
         JSONObject object = new JSONObject();



         if (page == 1) {

            TeamDividentsVO teamDividentsVO = teamDividentsSourceOrderUserMapService.sumByDateAndTargetUid(uid, minDay, maxDay);

            TeamDividentsVO teamDividentsVO = teamDividentsSourceOrderUserMapService.sumByDateAndTargetUid(uid, minDay, maxDay, key);

            if (teamDividentsVO == null) {

               teamDividentsVO = new TeamDividentsVO();

               teamDividentsVO.setSubsidy(BigDecimal.ZERO);