System 对象更名为 BusinessSystem

yujian

2019-03-14 4aadf484e193995c23ee1d5bb1971a497d2f9a0d

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java

@@ -21,7 +21,7 @@
import com.yeshi.fanli.entity.bus.user.SMSHistory;

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

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

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

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

import com.yeshi.fanli.entity.taobao.ClientTBPid;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TBPid;

@@ -30,19 +30,16 @@
import com.yeshi.fanli.exception.AlipayTransferException;

import com.yeshi.fanli.exception.UserAccountException;

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

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

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

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

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

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

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

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

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

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

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

@@ -53,10 +50,12 @@
import com.yeshi.fanli.service.inter.user.UserAccountService;

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

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

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

import com.yeshi.fanli.util.wx.WXLoginUtil;



@@ -78,8 +77,6 @@
   @Resource

   private OrderService orderService;



   @Resource

   private HongBaoService hongBaoService;



   @Resource

   private HongBaoV2Service hongBaoV2Service;

@@ -94,7 +91,7 @@
   private ConfigService configService;



   @Resource

   private SystemService systemService;

   private BusinessSystemService businessSystemService;



   @Resource

   private ShamUserService shamUserService;

@@ -104,12 +101,6 @@


   @Resource

   private LostOrderService lostOrderService;



   @Resource

   private OrderItemServcie orderItemServcie;



   @Resource

   private AccountDetailsService accountDetailsService;



   @Resource

   private AccountMessageService accountMessageService;

@@ -143,6 +134,9 @@


   @Resource

   private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;

	
   @Resource

   private UserSystemCouponService userSystemCouponService;



   private static final String PASSWORD_MAX_ERROR = "password_max_error";

   private static final String EXTRACT_MIN_MONEY = "extract_min_money";

@@ -165,7 +159,7 @@
   public void login(AcceptData acceptData, String code, String vcode, String phone, boolean wxinstall,

         String tbOpenid, String tbNickName, String tbPortrait, String tbSession, int loginType, Boolean first,

         HttpSession session, HttpServletRequest request, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -173,10 +167,15 @@


      if (loginType == 3 && !Constant.IS_TEST)// 验证短信验证码

      {

         String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_LOGIN);

         if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {

            out.print(JsonUtil.loadFalseResult(90001, "验证码错误"));

            return;

         // 苹果应用商店上线测试号码

         if ("17316780233".equalsIgnoreCase(phone) && "258168".equalsIgnoreCase(vcode)) {

            ;

         } else {

            String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_LOGIN);

            if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {

               out.print(JsonUtil.loadFalseResult(90001, "验证码错误"));

               return;

            }

         }



         redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);

@@ -221,6 +220,25 @@
         root.put("type", result.getType());

         root.put("data", data);

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

			
         final UserInfo uuser =  result.getUser();

         ThreadUtil.run(new Runnable() {

            public void run() {

               try {

                  int platformType = 0;

                  String platform = acceptData.getPlatform();

                  if ("android".equals(platform)) {

                     platformType = 1;

                  } else if ("ios".equals(platform)) {

                     platformType = 2;

                  }

                  userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());

               } catch (Exception e) {

                  e.printStackTrace();

               }

            }

         });

			
      } catch (UserAccountException e) {

         try {

            LogHelper.cookieLog("登录出错:" + e.getCode() + "-" + e.getMessage());

@@ -229,6 +247,7 @@
         }

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

      }

		
   }



   /**

@@ -246,7 +265,7 @@
   @RequestMapping(value = "register")

   public void register(AcceptData acceptData, String tbOpenid, String tbNickName, String tbPortrait, String vcode,

         String phone, HttpServletRequest request, HttpSession session, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -306,7 +325,7 @@
    */

   @RequestMapping(value = "connect")

   public void connect(AcceptData acceptData, long mainUid, long lessUid, HttpSession session, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -339,7 +358,7 @@
    */

   @RequestMapping(value = "getuid")

   public void getUid(AcceptData acceptData, String code, String tbOpenid, String phone, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -403,7 +422,7 @@
    */

   @RequestMapping(value = "bindPhone")

   public void bindPhone(AcceptData acceptData, Long uid, String vcode, String phone, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -466,7 +485,7 @@
    */

   @RequestMapping(value = "unBindPhone")

   public void unBindPhone(AcceptData acceptData, Long uid, String phone, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -502,7 +521,7 @@
   @RequestMapping(value = "bindTaoBao")

   public void bindTaoBao(AcceptData acceptData, Long uid, String tbOpenid, String tbNickName, String tbPortrait,

         String tbSession, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -564,7 +583,7 @@
    */

   @RequestMapping(value = "unBindTaoBao")

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

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -588,7 +607,7 @@
    */

   @RequestMapping(value = "changeWX")

   public void changeWX(AcceptData acceptData, Long uid, String code, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -635,7 +654,7 @@
    */

   @RequestMapping(value = "getphone")

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

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -655,7 +674,7 @@


   @RequestMapping(value = "verifyvcodeforbind")

   public void verifyVcodeForbind(AcceptData acceptData, Long uid, String vcode, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -700,7 +719,7 @@
    */

   @RequestMapping(value = "bindalipay")

   public void bindAlipay(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) {

      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -755,7 +774,7 @@
   @RequestMapping(value = "bindalipaywithverify")

   public void bindAlipayWithVerify(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) {



      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;

@@ -845,7 +864,7 @@
   @RequestMapping(value = "bindalipaywithverifynew")

   public void bindAlipayWithVerifyNew(AcceptData acceptData, Long uid, String name, String account, PrintWriter out) {



      System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

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

      if (system == null) {

         out.print(JsonUtil.loadFalseResult("系统不存在"));

         return;