热销转换发圈

Administrator

2020-02-24 09417e97672be66c5e312b10f23a9e30da3acb97

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java

@@ -39,6 +39,7 @@
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;

import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

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

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

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

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

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

@@ -63,6 +64,7 @@
import com.yeshi.fanli.util.account.UserUtil;

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



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller("WXMPUserAccountController")

@@ -92,20 +94,19 @@


   @Resource

   private ConfigService configService;

	


   @Resource

   private UserVIPInfoService userVIPInfoService;

	


   @Resource

   private UserVipConfigService userVipConfigService;

	


   @Resource

   private BanLiShopOrderService banLiShopOrderService;

	


   @Resource

   private HongBaoV2CountService hongBaoV2CountService;



	
   /**

    * 通过邀请码获取用户信息

    * 

@@ -153,10 +154,12 @@
      }



      String sessionKey = null;

      WXMPSessionInfo sessionInfo = (WXMPSessionInfo) session.getAttribute(UserController.WXMP_SESSION_INFO_KEY);

      WXMPSessionInfo sessionInfo = WXXCXUtil.getSessionInfo(Constant.WXMP_APP_INFO, code);

      if (sessionInfo == null) {

         out.print(JsonUtil.loadFalseResult(90000, "请重新登录"));

         return;

      } else {

         session.setAttribute(UserController.WXMP_SESSION_INFO_KEY, sessionInfo);

      }



      sessionKey = sessionInfo.getSessionKey();

@@ -184,7 +187,8 @@


      UserInfo lastUserInfo = null;

      if (!StringUtil.isNullOrEmpty(userData)) {

         String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.wxmpUserLogin, StringUtil.Md5(acceptData.getAppId() + "-" + acceptData.getOpenId()));

         String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.wxmpUserLogin,

               StringUtil.Md5(acceptData.getAppId() + "-" + acceptData.getOpenId()));

         String data = redisManager.getCommonString(redisKey);

         if (!StringUtil.isNullOrEmpty(data)) {

            lastUserInfo = new Gson().fromJson(data, UserInfo.class);

@@ -202,7 +206,7 @@
   }



   @RequestMapping("wxLogin")

   public void wxLogin(WXMPAcceptData acceptData, String wxEncryptedData, String wxIv, String inviteCode,

   public void wxLogin(WXMPAcceptData acceptData, String wxEncryptedData, String wxIv, String inviteCode, String code,

         HttpServletRequest request, HttpSession session, PrintWriter out) {

      if (StringUtil.isNullOrEmpty(acceptData.getOpenId())) {

         out.print(JsonUtil.loadFalseResult("openId为空"));

@@ -213,11 +217,7 @@
         out.print(JsonUtil.loadFalseResult("微信用户加密数据为空"));

         return;

      }

      WXMPSessionInfo sessionInfo = (WXMPSessionInfo) session.getAttribute(UserController.WXMP_SESSION_INFO_KEY);

      if (sessionInfo == null) {

         out.print(JsonUtil.loadFalseResult(90000, "请重新登录"));

         return;

      }

      WXMPSessionInfo sessionInfo = WXXCXUtil.getSessionInfo(Constant.WXMP_APP_INFO, code);



      String sessionKey = sessionInfo.getSessionKey();

      if (StringUtil.isNullOrEmpty(sessionKey)) {

@@ -252,7 +252,8 @@
         return;

      }



      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.wxmpUserLogin, StringUtil.Md5(acceptData.getAppId() + "-" + acceptData.getOpenId()));

      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.wxmpUserLogin,

            StringUtil.Md5(acceptData.getAppId() + "-" + acceptData.getOpenId()));



      UserInfo user = new Gson().fromJson(redisManager.getCommonString(key), UserInfo.class);

      if (user == null) {

@@ -308,7 +309,7 @@
               userAccountService.updateUserSelective(update);

            }

         });

         break;

         return;

      case WXMPLoginResult.CODE_BIND_PHONE:

         // 需要绑定电话号码

         redisManager.saveObj(result.getUser(), key, 60 * 5);// 只缓存5分钟

@@ -332,8 +333,8 @@
         out.print(JsonUtil.loadFalseResult("openId为空"));

         return;

      }

		
      if(uid==null){



      if (uid == null) {

         out.print(JsonUtil.loadFalseResult("uid为空"));

         return;

      }

@@ -342,7 +343,7 @@
         out.print(JsonUtil.loadFalseResult("微信信息为空"));

         return;

      }

		


      WXMPSessionInfo sessionInfo = (WXMPSessionInfo) session.getAttribute(UserController.WXMP_SESSION_INFO_KEY);

      if (sessionInfo == null) {

         out.print(JsonUtil.loadFalseResult(90000, "请重新登录"));

@@ -397,8 +398,7 @@
         out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

      }

   }

	
	


   /**

    * 绑定电话号码 V1.5.3

    * 

@@ -458,8 +458,6 @@
      }

   }



	
	
   /**

    * 获取vip信息

    * 

@@ -488,7 +486,7 @@
      vo.setNickName(userInfo.getNickName());

      vo.setPortrait(userInfo.getPortrait());

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

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

      vo.setCsdLink(configService.get(ConfigKeyEnum.customerServiceLink.getKey()));



      Date now = new Date();

      Date start = new Date(0);

@@ -540,15 +538,14 @@
      }

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

@@ -586,11 +583,11 @@


      JSONObject data = new JSONObject();

      data.put("info", gson.toJson(vo));

      data.put("welfare", userVipConfigService.getValueByKey("vip_welfare"));

      data.put("welfare", JSONArray.fromObject(userVipConfigService.getValueByKey("vip_welfare")));

      if (!StringUtil.isNullOrEmpty(callback)) {

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

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

      } else {

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

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

      }

   }



@@ -621,7 +618,8 @@
      list.add(BanLiShopOrder.STATE_SUCCESS);

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



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



@@ -636,7 +634,7 @@
      } catch (ParseException e) {

         e.printStackTrace();

      }

				


      UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);

      if (extra != null

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

@@ -675,4 +673,13 @@
         out.print(JsonUtil.loadTrueResult("已申请"));

      }

   }



   @RequestMapping("logout")

   public void logout(WXMPAcceptData acceptData, Long uid, PrintWriter out) {

      if (uid == null) {

         out.print(JsonUtil.loadFalseResult("uid为空"));

         return;

      }

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

   }

}