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

admin

2020-06-22 07a64ebd6da54fb9481d9bf7e7afce62dce1ff21

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

@@ -305,14 +305,14 @@
         userInfoVO.setTotalOrder(commonOrderCountService.countHistoryOrderNum(uid));

         

         // 累计兑换金币

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

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

         

         // 邀请人

         UserInfo boss = threeSaleSerivce.getBoss(uid);

         if (boss == null) {

            userInfoVO.setBossName("");

         } else {

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

            userInfoVO.setBossName("邀请人：" + boss.getNickName());

         }

         

         // 微信号