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;

@@ -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);

      }

   }

}