Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

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

@@ -1,6 +1,13 @@
package com.yeshi.fanli.controller.client.v2;



import java.io.PrintWriter;

import java.lang.reflect.Type;

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;

import javax.servlet.http.HttpServletRequest;

@@ -10,14 +17,26 @@
import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.google.gson.JsonElement;

import com.google.gson.JsonPrimitive;

import com.google.gson.JsonSerializationContext;

import com.google.gson.JsonSerializer;

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;

import com.yeshi.fanli.entity.system.BusinessSystem;

import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.BusinessSystemService;

import com.yeshi.fanli.service.inter.config.ConfigService;

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

import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;

import com.yeshi.fanli.service.inter.money.UserMoneyService;

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

@@ -25,6 +44,8 @@
import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;

import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;

import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;

import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

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

@@ -35,18 +56,24 @@
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;

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

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;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.TimeUtil;

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;



@@ -94,6 +121,9 @@
   private DeviceTokenOPPOService deviceTokenOPPOService;



   @Resource

   private DeviceTokenVIVOService deviceTokenVIVOService;



   @Resource

   private TaoBaoUnionConfigService taoBaoUnionConfigService;



   @Resource

@@ -128,11 +158,30 @@


   @Resource

   private DeviceActiveService deviceActiveService;

	


   @Resource

   private BindRemindService bindRemindService;



   @Resource

   private UserVIPInfoService userVIPInfoService;



   @Resource

   private HongBaoV2CountService hongBaoV2CountService;



   @Resource

   private IntegralDetailService integralDetailService;



   @Resource

   private BanLiShopOrderService banLiShopOrderService;



   @Resource

   private ConfigService configService;



   @Resource

   private UserVipConfigService userVipConfigService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   /**

    * 新版登录 V1.5.3

@@ -147,7 +196,7 @@
    * @param out

    */

   @RequestMapping(value = "login", method = RequestMethod.POST)

   public void login(AcceptData acceptData, int loginType, String vcode, String phone, String code, 
   public void login(AcceptData acceptData, int loginType, String vcode, String phone, String code,

         HttpServletRequest request, PrintWriter out) {

      try {

         BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

@@ -186,19 +235,11 @@
                     LogHelper.errorDetailInfo(e);

                  }



                  if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {

                     /* 新人红包 */

                     try {

                        userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device);

                     } catch (Exception e) {

                        e.printStackTrace();

                     }

                  }

						
                  // 绑定oppo推送

                  // 绑定oppo,VIVO推送

                  DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());

                  if (active != null) {

                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());

                     deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());

                  }

               }

            });

@@ -221,7 +262,7 @@
               e1.printStackTrace();

            }

         }

			


      } catch (Exception e) {

         out.print(JsonUtil.loadFalseResult("登录失败"));

         try {

@@ -232,8 +273,6 @@
      }

   }



	
	
   /**

    * 绑定电话号码 V2.0.1 微信登录

    * 

@@ -244,7 +283,8 @@
    */

   @RequestSerializableByKey(key = "'bindPhoneLogin-'+#phone")

   @RequestMapping(value = "bindPhoneLogin")

   public void bindPhoneLogin(AcceptData acceptData,String vcode, String phone, String key, HttpServletRequest request, PrintWriter out) {

   public void bindPhoneLogin(AcceptData acceptData, String vcode, String phone, String key,

         HttpServletRequest request, PrintWriter out) {

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

            acceptData.getPackages());

      if (system == null) {

@@ -266,7 +306,7 @@
         out.print(JsonUtil.loadFalseResult("key值不能为空"));

         return;

      }

		


      phone = phone.replaceAll(" ", "");



      String oldVCode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_BIND);

@@ -290,7 +330,7 @@
         out.print(JsonUtil.loadFalseResult(1, "绑定失败"));

      }

   }

	


   /**

    * 绑定电话号码 V2.0.1 微信登录

    * 

@@ -309,5 +349,209 @@
      bindRemindService.addBindPhone(uid);

      out.print(JsonUtil.loadTrueResult("记录成功"));

   }

	


   /**

    * 获取vip信息

    * 
    * @param acceptData

    * @param uid

    * @param out

    */

   @RequestMapping(value = "getVIPInfo")

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

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

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

         return;

      }



      UserInfo userInfo = userInfoService.selectByPKey(uid);

      if (userInfo == null) {

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

         return;

      }

      //

      String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);



      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"));



      // 省钱 -自购产生返利

      BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);

      // 分享赚

      BigDecimal rewardShare = hongBaoV2CountService.getRewardMoneyByShare(uid);

      // 邀请赚

      BigDecimal rewardInvite = hongBaoV2CountService.getRewardMoneyByInvite(uid);



      UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);

      vo.setVipInfo(userVIPInfo);

      String leftTime = "";

      if (userVIPInfo != null && userVIPInfo.getApplyTime() != null) {

         // TODO 计算时间

         long s = 48 * 60 * 60 - ((System.currentTimeMillis() - userVIPInfo.getApplyTime().getTime()) / 1000);

         if (s > 3600) {

            leftTime = s / 3600 + "小时";

            leftTime = "还剩" + leftTime;

         } else if (s >= 60) {

            leftTime = s / 60 + "分钟";

            leftTime = "还剩" + leftTime;

         } else if (s > 0) {

            leftTime = s + "秒";

            leftTime = "还剩" + leftTime;

         }

      }

      vo.setLeftTime(leftTime);



      if (userVIPInfo != null && userVIPInfo.getState() != null

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

         vo.setSuccessTime(TimeUtil.getGernalTime(userVIPInfo.getSuccessTime().getTime(), "yyyy.MM.dd"));

         vo.setConserveMoney(finishMoney);

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

      } else {

         BigDecimal rate1 = new BigDecimal(5);

         BigDecimal rate2 = new BigDecimal(12);

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

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

      }

      vo.setFinishMoney(finishMoney);



      // 会员规则执行时间

      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);

      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")));



      GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

      gsonBuilder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {

         @Override

         public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {

            if (value == null) {

               return new JsonPrimitive("");

            } else {

               // 保留2位小数

               value = value.setScale(2);

               return new JsonPrimitive(value.toString());

            }

         }

      });

      Gson gson = gsonBuilder.create();

		
		
      if (!StringUtil.isNullOrEmpty(callback)) {

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

      } else {

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

      }

   }



   /**

    * 开通VIP

    * 
    * @param callback

    * @param acceptData

    * @param uid

    * @param out

    */

   @RequestMapping(value = "applyVip")

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

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

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

         return;

      }



      UserInfo userInfo = userInfoService.selectByPKey(uid);

      if (userInfo == null) {

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

         return;

      }



      // 省钱 -自购产生返利



      // 会员规则执行时间

      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);

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



      BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid);

      long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, executeDate.getTime(), payMoney);

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

      BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);



      long limitTeam = 0;



      UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);

      if (extra != null

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

         limitTeam = (Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user")));

      } else {

         limitTeam = (Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_new_user")));

      }

      long limitHongBao = (Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy")));

      BigDecimal limitMoney = (new BigDecimal(userVipConfigService.getValueByKey("require_fan_money")));

      BigDecimal limitgoldCoin = (new BigDecimal(userVipConfigService.getValueByKey("require_gold_coin")));



      if (finishGoldCoin.compareTo(limitgoldCoin) >= 0 && finishTeam >= limitTeam && finishHongBao >= limitHongBao

            && finishMoney.compareTo(limitMoney) >= 0) {// 条件符合

         ;

      } else {

         if (!StringUtil.isNullOrEmpty(callback)) {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("未达到开通条件")));

         } else {

            out.print(JsonUtil.loadFalseResult("未达到开通条件"));

         }

         return;

      }

      // 开通

      try {

         userVIPInfoService.applyVIP(uid);

      } catch (UserVIPInfoException e) {

         if (!StringUtil.isNullOrEmpty(callback)) {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getMsg())));

         } else {

            out.print(JsonUtil.loadFalseResult(e.getMsg()));

         }

         return;

      }



      if (!StringUtil.isNullOrEmpty(callback)) {

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

      } else {

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

      }

   }



}