2.0.7相关服务端功能添加

admin

2020-02-23 b59fef5c00b15fdfdfa9d4be26e5bf6b41c75458

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

@@ -232,6 +232,7 @@
         } else {

            JSONObject data = new JSONObject();

            data.put("userInfo", UserUtil.filterForClientUser(userInfo));

            data.put("inviteCode", userInfoExtraService.getInviteCodeByUid(userInfo.getId()));

            out.print(JsonUtil.loadTrueResult(data));



            final UserInfo uuser = userInfo;

@@ -441,16 +442,15 @@
      }

      vo.setFinishMoney(hongBaoV2CountService.getRewardMoneyBySelf(uid));



		
      List<Integer> list = new ArrayList<Integer>();

      list.add(BanLiShopOrder.STATE_SUCCESS);

      BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));



      vo.setFinishGoldCoin(Long.parseLong(integralDetailService.getCumulativeMoney(uid).setScale(0).toString()));

      vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney));

      vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,

            TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney));

      vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));



		
      // 区分老用户和新用户

      String limtDate = userVipConfigService.getValueByKey("vip_execute_time");

      Date executeDate = null;

@@ -521,7 +521,8 @@
      BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));



      BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid);

      long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);

      long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid,

            TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);

      long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);

      BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);



@@ -536,7 +537,7 @@
      } catch (ParseException e) {

         e.printStackTrace();

      }

				


      UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);

      if (extra != null

            && (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {