Merge remote-tracking branch 'origin/div' into div

admin

2020-05-23 37e8ba46879a6094938ad685b1054eb6446ae749

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

@@ -34,6 +34,7 @@
import com.yeshi.fanli.entity.order.OrderMoneyDailyCount;

import com.yeshi.fanli.entity.order.OrderMoneyDailyCount.SourceTypeEnum;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.money.TeamEincomeRecordService;

@@ -778,11 +779,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 +803,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);

@@ -893,6 +894,7 @@
      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("统计失败"));

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

      }

   }

   

@@ -954,8 +956,14 @@
         

         List<OrderRankingVO> list = orderMoneyDailyCountService.getRankingByOrderNum(uid, minDate, maxDate);

         if (list.size() > 0) {

            for (OrderRankingVO vo: list) {

            for (int i = 0; i < list.size(); i ++) {

               OrderRankingVO vo = list.get(i);

               UserInfo user = userInfoService.getUserByIdWithMybatis(vo.getUid());

               if (user == null) {

                  list.remove(i);

                  i--;

                  continue;

               }

               vo.setNickName(user.getNickName());

               vo.setPortrait(user.getPortrait());

            }

@@ -967,6 +975,7 @@
      } catch (Exception e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("统计失败"));

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

      }

   }

}