唯品会订单bug修复，APP端佣金比例展示错误bug修复

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java

@@ -34,9 +34,11 @@
import com.yeshi.fanli.exception.user.UserInfoException;

import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.service.inter.order.CommonOrderCountService;

import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.tb.TaoBaoUnionAuthRecordService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

@@ -79,7 +81,10 @@


   @Resource

   private HongBaoV2CountService hongBaoV2CountService;



	
   @Lazy

   @Resource

   private CommonOrderCountService commonOrderCountService;



   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;

@@ -89,10 +94,16 @@


   @Resource

   private SpreadUserImgService spreadUserImgService;



	
   @Lazy

   @Resource

   private IntegralDetailService integralDetailService;

	
   @Lazy

   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;

	
	


   public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {

      List<UserInfo> list = null;

@@ -256,6 +267,61 @@
      return UserUtil.filterForClientUser(user);

   }



	
	
   @Override

   public long countInfo(Integer userState, String key, Integer keyType, String userRank, Integer days,

         String startTime, String endTime,Integer userType, String level, Integer activeCode) {

      return userInfoMapper.countInfo(userState, key, keyType, userRank, days, startTime, endTime,userType, level, activeCode);

   }



   @Override

   public List<UserInfoVO> queryInfo(long start, int count, Integer userState, String key, Integer keyType,

         String userRank, Integer days, String startTime, String endTime, Integer userType, String level, Integer activeCode) {



      List<UserInfoVO> userList = userInfoMapper.queryInfo(start, count, userState, key, keyType, userRank, days,

            startTime, endTime, userType, level, activeCode);



      if (userList == null || userList.size() == 0) {

         return null;

      }



      for (UserInfoVO userInfoVO : userList) {

         Long uid = userInfoVO.getId();

         String rankName = userInfoVO.getRankName();

         if (rankName == null || rankName.trim().length() == 0) {

            userInfoVO.setRankName("青铜");

            userInfoVO.setRankPicture("http://img.flqapp.com/resource/rank/rank_picture_new_1.png");

         }



         String userLevel = userInfoVO.getUserLevel();

         if (!StringUtil.isNullOrEmpty(userLevel)) {

            userInfoVO.setUserLevel(UserLevelUtil.getByEnumName(userLevel).getName());

         }

         // 累计提现

         userInfoVO.setTotalExtract(payInfoMapper.sumMoneyByUid(uid));

			
         // 累计订单数量

         userInfoVO.setTotalOrder(commonOrderCountService.countHistoryOrderNum(uid));

			
         // 累计兑换金币

         userInfoVO.setTotalGoldCoinUsed(integralDetailService.sumUseGoldCoin(uid));

			
         // 邀请人

         UserInfo boss = threeSaleSerivce.getBoss(uid);

         if (boss == null) {

            userInfoVO.setBossName("");

         } else {

            userInfoVO.setBossName("上级：" + boss.getNickName());

         }

      }



      return userList;

   }



	
	
	
   @Override

   public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,

         String startTime, String endTime,Integer userType, String level, Integer activeCode) {