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

admin

2019-12-03 8d38972b593b5ba698b0e605039ed8c795eaaef5

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

@@ -2,7 +2,10 @@


import java.io.PrintWriter;

import java.math.BigDecimal;

import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;

@@ -16,6 +19,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.SMSHistory;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.entity.shop.BanLiShopOrder;

@@ -44,6 +48,7 @@
import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;

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

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

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

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

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

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

@@ -51,6 +56,7 @@
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.vip.UserVIPInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -58,6 +64,7 @@
import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.vo.user.UserVipRateVO;



import net.sf.json.JSONObject;



@@ -160,6 +167,12 @@


   @Resource

   private ConfigService configService;

	
   @Resource

   private UserVipConfigService userVipConfigService;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;

   

   /**

    * 新版登录 V1.5.3

@@ -336,73 +349,85 @@
    * @param out

    */

   @RequestMapping(value = "getVIPInfo")

   public void getVIPInfo(AcceptData acceptData, Long uid, PrintWriter out) {

   public void getVIPInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {

      if (uid == null || uid <= 0) {

         out.print(JsonUtil.loadFalseResult("用户id为空"));

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }

      

      UserInfo userInfo = userInfoService.selectByPKey(uid);

      if (userInfo == null) {

         out.print(JsonUtil.loadFalseResult("该用户不存在"));

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "该用户不存在"));

         return;

      }

		
      JSONObject data = new JSONObject();

      data.put("id", uid);

      data.put("nickName", userInfo.getNickName());

      data.put("portrait", userInfo.getPortrait());

      //

      String inviteCode = "";

      UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

      if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) 
         inviteCode = userInfoExtra.getInviteCode();

			
      UserVipRateVO vo = new UserVipRateVO();

      vo.setId(uid);

      vo.setInviteCode(inviteCode);

      vo.setNickName(userInfo.getNickName());

      vo.setPortrait(userInfo.getPortrait());

      vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5"));

      vo.setCsdLink(configService.get("customer_service_link"));

   

      UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);

      boolean vip = false;

      if (userVIPInfo != null && userVIPInfo.getState() != null 
            && userVIPInfo.getState() == UserVIPInfo.STATE_SUCCESS) {

         vip = true;

         data.put("applyTime", userVIPInfo.getSuccessTime());

      } 
      data.put("vip", vip);

		
      // 省钱 -自购产生返利   

      BigDecimal rewardPurchase = hongBaoV2CountService.getRewardMoneyBySelf(uid);

      data.put("rurchaseReward", rewardPurchase.setScale(2));

		
      BigDecimal conserveMoney = rewardPurchase;

      if (!vip) { // 少省钱：  自购产生返利  * 5/12

         BigDecimal rate1 = new BigDecimal(5);

         BigDecimal rate2 = new BigDecimal(12);

         conserveMoney = MoneyBigDecimalUtil.mul2(rewardPurchase,  MoneyBigDecimalUtil.div(rate1, rate2));

      }

      data.put("conserveMoney", conserveMoney.setScale(2));

		
      BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);

      // 分享赚

      BigDecimal rewardShare = hongBaoV2CountService.getRewardMoneyByShare(uid);

      // 邀请赚

      BigDecimal rewardInvite = hongBaoV2CountService.getRewardMoneyByInvite(uid);      

		
      BigDecimal earnMoney = rewardShare;

      if (vip) { // 赚钱=分享+邀请  
         earnMoney = MoneyBigDecimalUtil.add(rewardShare, rewardInvite );

      } else { // 少赚钱： 分享赚* 5/12

				
      UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);

      if (userVIPInfo != null && userVIPInfo.getState() != null 
            && userVIPInfo.getState() == UserVIPInfo.STATE_SUCCESS) { // VIP

         SimpleDateFormat format = new SimpleDateFormat("yyyy.mm.dd");

         vo.setVip(true);

         vo.setSuccessTime(format.format(userVIPInfo.getSuccessTime()));

         vo.setConserveMoney(finishMoney.setScale(2));

         vo.setEarnMoney(MoneyBigDecimalUtil.add(rewardShare, rewardInvite).setScale(2));

      } else {

         BigDecimal rate1 = new BigDecimal(5);

         BigDecimal rate2 = new BigDecimal(12);

         earnMoney = MoneyBigDecimalUtil.mul2(rewardShare,  MoneyBigDecimalUtil.div(rate1, rate2));

         vo.setConserveMoney(MoneyBigDecimalUtil.mul2(finishMoney,  MoneyBigDecimalUtil.div(rate1, rate2)).setScale(2));

         vo.setEarnMoney( MoneyBigDecimalUtil.mul2(rewardShare,  MoneyBigDecimalUtil.div(rate1, rate2)).setScale(2));

      }

      data.put("earnMoney", earnMoney.setScale(2));

      vo.setFinishMoney(finishMoney.setScale(2));

      

      // 注：1.有效一级队员定义：2019年1月1日起，自购或分享1笔且付款总金额不小于1元（退款为失效）；

      long teamNum = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, "2019-01-01", new BigDecimal(1));

      data.put("teamNum", teamNum);

		
      // 累计金币

      BigDecimal goldCoin = integralDetailService.getCumulativeMoney(uid);

      data.put("goldCoin", goldCoin.setScale(0));

      // 帮助链接

      data.put("helpLink", configService.get("help_link_vip_info"));

		
      // 使用红包次数

      // 会员规则执行时间

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

      Date executeDate = null;

      try {

         SimpleDateFormat format = new SimpleDateFormat("yyyy-mm-dd");

         executeDate = format.parse(limtDate);

      } catch (ParseException e) {

         e.printStackTrace();

      }

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

      list.add(BanLiShopOrder.STATE_SUCCESS);

      data.put("shopNum", banLiShopOrderService.countByUidAndState(uid, list));

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

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

		
      vo.setFinishGoldCoin(integralDetailService.getCumulativeMoney(uid));

      vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, executeDate.getTime(), payMoney));

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

		
      UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);

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

         vo.setLimitTeam(Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user")));

      } else {

         vo.setLimitTeam(Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_new_user")));

      }

      vo.setLimitHongBao(Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy")));

      vo.setLimitMoney(new BigDecimal(userVipConfigService.getValueByKey("require_fan_money")));

      vo.setLimitgoldCoin(new BigDecimal(userVipConfigService.getValueByKey("require_gold_coin")));

		
      if (!StringUtil.isNullOrEmpty(callback)) {

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(vo)));

      } else {

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

      }

   }

}