Merge remote-tracking branch 'origin/master'

admin

2019-03-06 5aeec2b48b5c3f1ed9d9ecf8b95a8ddc2031d43d

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

@@ -90,10 +90,9 @@


   @Resource

   private ShareMapper shareMapper;

	


   @Resource

   private HongBaoV2CountService hongBaoV2CountService;

	


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

      List<UserInfo> list = null;

@@ -104,6 +103,16 @@
         list = userInfoDao.list("from UserInfo u where u.wxUnionId=? and u.appId = ? ",

               new Serializable[] { openid, appid });

      }



      if (list != null)

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

            if (list.get(i).getState() == UserInfo.STATE_DELETE

                  || list.get(i).getState() == UserInfo.STATE_DELETE_OUT_OF_DATE) {

               list.remove(i);

               i--;

            }

         }



      if (list != null && list.size() > 0) {

         return list.get(0);

      }

@@ -622,7 +631,7 @@


   @Override

   public UserInfo getUserByIdWithMybatis(long uid) {

      UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

      UserInfo user = userInfoMapper.selectByPKey(uid);

      return UserUtil.filterForClientUser(user);

   }



@@ -701,7 +710,7 @@


         // 历史总订单

         long totalOrder = hongBaoV2CountService.countValidNumberByUid(uid, null);

			


         // 今日总订单

         long todayOrder = hongBaoV2CountService.countValidNumberByUid(uid, 1);

         // 本月总订单

@@ -710,24 +719,20 @@
         userInfoAdmin.setTotalOrder(totalOrder);

         userInfoAdmin.setTodayOrder(todayOrder);

         userInfoAdmin.setMonthOrder(monthOrder);

			
			


         // 未领取红包 待入账金额

         BigDecimal unaccountedMoney = hongBaoV2CountService.countWillGetMoneyByUid(uid);

         if (unaccountedMoney ==null) {

         if (unaccountedMoney == null) {

            unaccountedMoney = new BigDecimal(0);

         }

         userInfoAdmin.setUnaccountedMoney(unaccountedMoney.toString());



         // 历史总收益

         BigDecimal totalMoneyHistory = hongBaoV2CountService.countMoneyByUidAndState(uid,3);

         if (totalMoneyHistory ==null) {

         BigDecimal totalMoneyHistory = hongBaoV2CountService.countMoneyByUidAndState(uid, 3);

         if (totalMoneyHistory == null) {

            totalMoneyHistory = new BigDecimal(0);

         }

         userInfoAdmin.setTotalMoneyHistory(totalMoneyHistory.toString());

			
			
			


         // 支付宝账号 累计转账总金额

         double totalMoney = payInfoMapper.sumMoneyByUid(uid);

@@ -814,6 +819,7 @@


   /**

    * 根据电话号码、邀请码获取邀请用户

    * 
    * @param phone

    * @param inviteCode

    * @return

@@ -822,5 +828,5 @@
   public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode) {

      return userInfoMapper.getInfoByPhoneOrInviteCode(phone, inviteCode);

   }

	


}