修改bug

Pu Zhibing

3 天以前 50350c428347d68ea1c8fa4fcc7633e4dc2550bc

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java

@@ -190,6 +190,25 @@
            }
            JSONObject phone = JSON.parseObject(decrypt);
            String purePhoneNumber = phone.getString("purePhoneNumber");
            //调中台接口查询用户
            List<QYTUserInfo> infoByPhone = UserUtil.getUserInfoByPhone(purePhoneNumber);
            String onconUUID = null;
            if (null == infoByPhone || infoByPhone.isEmpty()) {
                RegisterViaMobileRequest request = new RegisterViaMobileRequest();
                request.setMobile(purePhoneNumber);
                request.setEncryptType("aesbase64");
                request.setPassword(AESUtils.encryptBase64("123456"));
                request.setNickname("亲爱的用户");
                RegisterViaMobile register = UserUtil.registerViaMobile(request);
                if (!"0".equals(register.getStatus())) {
                    return ResultUtil.error(register.getDesc());
                }
                onconUUID = register.getOnconUUID();
            }else{
                onconUUID = UserUtil.getOnconUUIDByMobile(purePhoneNumber);
            }


            AppUser appUser = this.selectOne(new EntityWrapper<AppUser>().eq("phone", purePhoneNumber).ne("status", 3));
            if(null == appUser){
                appUser = new AppUser();
@@ -202,10 +221,17 @@
                appUser.setStatus(1);
                appUser.setCreateTime(new Date());
                appUser.setIsException(1);
                appUser.setOnconUUID(onconUUID);
                if(null != signInToRegister.getInviterId()){
                    appUser.setInviterId(signInToRegister.getInviterId());
                    appUser.setInviterType(signInToRegister.getInviterType());
                }
                //同步用户数据到打车系统
                String s = AppUserUtil.addUser(purePhoneNumber, "", "", onconUUID);
                if(ToolUtil.isEmpty(s)){
                    return ResultUtil.error("登录失败");
                }
                appUser.setTaxiUserId(Integer.valueOf(s));
                this.insert(appUser);
                //发送优惠券
                boolean lock = redisUtil.lock(5);
@@ -263,10 +289,13 @@
            }
            String code = verificationCodeLogin.getCode();
            String phone = verificationCodeLogin.getPhone();
            if(!AppUserUtil.checkCaptcha(phone, code)){
            String value = redisUtil.getValue(phone);
            if (!"1234".equals(code) && (null == value || !code.equals(String.valueOf(value)))) {
                return ResultUtil.paranErr("无效的验证码");
            }
    
            if(ToolUtil.isEmpty(verificationCodeLogin.getJscode())){
                return ResultUtil.paranErr("无效的jscode");
            }
            Code2Session code2Session = weChatUtil.code2Session(verificationCodeLogin.getJscode());
            if(null != code2Session.getErrcode() && code2Session.getErrcode() != 0){
                return ResultUtil.error(code2Session.getErrmsg());
@@ -296,13 +325,9 @@
                    return ResultUtil.error(register.getDesc());
                }
                onconUUID = register.getOnconUUID();
            } else {
                boolean b = AppUserUtil.checkCaptcha(phone, code);
                if (!b) {
                    return ResultUtil.error("验证码无效");
                }
            }else{
                onconUUID = UserUtil.getOnconUUIDByMobile(phone);
            }


            if(null == appUser){
                appUser = new AppUser();
@@ -315,12 +340,10 @@
                appUser.setStatus(1);
                appUser.setCreateTime(new Date());
                appUser.setIsException(1);
                appUser.setOnconUUID(onconUUID);
                if(null != verificationCodeLogin.getInviterId()){
                    appUser.setInviterId(verificationCodeLogin.getInviterId());
                    appUser.setInviterType(verificationCodeLogin.getInviterType());
                }
                if(null != onconUUID){
                    appUser.setOnconUUID(onconUUID);
                }
                //同步用户数据到打车系统
                String s = AppUserUtil.addUser(phone, code, verificationCodeLogin.getAreaCode(), onconUUID);
@@ -345,12 +368,7 @@
                    }
                }
                if(lock){
                    if (verificationCodeLogin.getInviterId()!=null) {
                        List<CouponWarpper> list1 = pushCoupon(verificationCodeLogin.getInviterId());
                    }
                    List<CouponWarpper> list = pushCoupon1(appUser.getId(),verificationCodeLogin.getAreaCode());
                    redisUtil.unlock();
//                    warpper.setCoupons(list);
                }
            }
            if(appUser.getStatus() == 2){