6.11

luodangjia

2024-06-11 9d2babb8bb99d55d76eab0558fd9f510652b270c

 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -150,7 +150,7 @@
                templateCode = "c230a6b92504473c97c17741e1cc0b9d";//修改密码
                break;
        }
        aLiSendSms.sendSms(phone, "SMS_147415322", "{\"code\":\"" + authCode + "\"}");
        aLiSendSms.sendSms(phone, "SMS_467580138", "{\"code\":\"" + authCode + "\"}");
//        HuaWeiSMSUtil.sendSms("[\"" + authCode + "\"]", phone, "8822061324669", templateCode);
//        String sData = aLiSendSms.sendSms(phone, templateCode, "{\"code\":\"" + authCode + "\"}");
////        JSONObject jsonObject = JSON.parseObject(sData);
@@ -223,6 +223,7 @@
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/a9fb2816e36644b292515ffdd6ebb411.jpg");

            //用户所属企业
            if(null != registAreaCode){
@@ -231,6 +232,9 @@
                userInfo.setRegistAreaCode(registAreaCode);
            }
            this.insert(userInfo);

            addnewCoupoun(phone,userInfo);


            this.addCoupon(userInfo);//添加优惠券

@@ -264,6 +268,50 @@
        smsrecordService.saveData(1, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");
        return ResultUtil.success(loginWarpper);
    }

    @Autowired
    private ITActivityGeneralizationService activityGeneralizationService;



    @Autowired
    private ISysCouponRecordService sysCouponRecordService;
    public void addnewCoupoun(String phone,UserInfo userInfo){
        if (redisUtil.getValue("counpon:" + phone)==null){
            return;
        }
        Integer acId = Integer.valueOf(redisUtil.getValue("counpon:" + phone));

        TActivityGeneralization tActivityGeneralization = activityGeneralizationService.selectById(acId);
        SysCouponRecord sysCouponRecord = sysCouponRecordService.selectById(tActivityGeneralization.getCouponId());
        Date date = new Date();
        UserCouponRecord userCouponRecord = new UserCouponRecord();
        userCouponRecord.setActivityType(5);
        userCouponRecord.setCouponActivityId(acId);
        userCouponRecord.setCouponId(tActivityGeneralization.getCouponId());
        userCouponRecord.setState(1);
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + sysCouponRecord.getEffective());
        userCouponRecord.setExpirationTime(calendar.getTime());
        userCouponRecord.setCouponType(Integer.valueOf(String.valueOf(sysCouponRecord.getCouponType())));
        userCouponRecord.setCouponUseType(sysCouponRecord.getCouponUseType());
        userCouponRecord.setInsertTime(date);
        userCouponRecord.setFullMoney(Double.valueOf(String.valueOf(sysCouponRecord.getFullMoney()==null?0:sysCouponRecord.getFullMoney())));
        userCouponRecord.setMoney(Double.valueOf(String.valueOf(sysCouponRecord.getMoney())));
        userCouponRecord.setCompanyId(userInfo.getCompanyId());
        userCouponRecord.setUserId(userInfo.getId());

        Integer userGrantCount = tActivityGeneralization.getUserGrantCount();
//            userCouponRecordService.insert(userCouponRecord);
        if (userGrantCount != null && userGrantCount > 0) {
            for (int i = 0; i < userGrantCount; i++) {// ...
                userCouponRecordService.insert(userCouponRecord);
            }
        }

    }

    /**
     * 手机验证码登录
     * @param accessToken
@@ -293,6 +341,7 @@
            userInfo.setConsumption(0D);
            userInfo.setBalance(0D);
            userInfo.setState(1);
            userInfo.setAvatar("http://bao-weiqing.oss-cn-hangzhou.aliyuncs.com/img/a9fb2816e36644b292515ffdd6ebb411.jpg");

            //用户所属企业
            if(null != registAreaCode){
@@ -1162,7 +1211,7 @@
     */
    public String getDefaultName(){
        int num = this.selectCount(new EntityWrapper<UserInfo>().ne("flag", 3)) + 1000001;
        return "FB" + String.valueOf(num).substring(1);
        return "WL" + String.valueOf(num).substring(1);
    }