增加订单解析配置信息

admin

2019-04-12 176a83fedd71847a088bafb541b9a8877d6234b7

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -27,7 +27,6 @@
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

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

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

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

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

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

@@ -41,6 +40,7 @@
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.FileUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -83,6 +83,9 @@


   @Resource

   private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Transactional

   @Override

@@ -909,22 +912,22 @@
      }

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

            

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

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

         ;

      } else {



         if (StringUtil.isNullOrEmpty(vcode)) {

            throw new UserAccountException(1, "请输入验证码");

         }



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

         LogHelper.test("----------------------登录验证码： " + oldVcode);

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

            throw new UserAccountException(1, "验证码错误，重新输入");

         }

      }

      redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);

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

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

//         ;

//      } else {

//

//         if (StringUtil.isNullOrEmpty(vcode)) {

//            throw new UserAccountException(1, "请输入验证码");

//         }

//

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

//         LogHelper.test("----------------------登录验证码： " + oldVcode);

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

//            throw new UserAccountException(1, "验证码错误，重新输入");

//         }

//      }

//      redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);

      

      JSONObject logInfo = new JSONObject();

      logInfo.put("appId", appId);

@@ -954,6 +957,14 @@
         userInfo.setState(UserInfo.STATE_NORMAL);

         // 创建用户

         addUser(userInfo);

			
			
         try {

            // 第一次登录时创建用户额外信息

            userInfoExtraService.createUserInfoExtra(userInfo.getId());

         } catch (Exception e) {

            e.printStackTrace();

         }

      }



      return userInfo;

@@ -1003,6 +1014,13 @@
         userInfo.setLastLoginIp(request.getRemoteHost());

         userInfo.setState(UserInfo.STATE_NORMAL);

         addUser(userInfo);

			
         try {

            // 第一次登录时创建用户额外信息

            userInfoExtraService.createUserInfoExtra(userInfo.getId());

         } catch (Exception e) {

            e.printStackTrace();

         }

      }

      return userInfo;

   }