#

LSH

2023-11-28 237f9af69f9bf1a9ef8cd46e60ec368caa549ae7

#

 src/main/java/com/zy/crm/manager/controller/PlanController.java

@@ -225,11 +225,11 @@
        if (!planFollService.insert(planFoll)) {
            throw new CoolException("保持失败，请重试");
        }

        if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
            return R.ok("创建成功但短信发送失败!");
        if (users.size()>1 && !users.get(1).getId().equals(getUserId())){
            if (!smsCodeService.sendSmsCodeText(users.get(1).getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
                return R.ok("创建成功但短信发送失败!");
            }
        }

        return R.ok();
    }

@@ -336,7 +336,7 @@
        if (!planService.updateById(hostPlan)) {
            throw new CoolException("更新失败，请重试");
        }
        if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
        if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
            return R.ok("创建成功但短信发送失败!");
        }
        return R.ok("保存成功");
@@ -544,12 +544,12 @@
        }
        if (!plan.getSettle().equals(plan.getSettleSize())){
            if (!Cools.isEmpty(plannerId) && nextUserId.equals(plannerId)){
                if (!smsCodeService.sendSmsCodeText(plannerUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M6F3C81FE3)) {
                if (!smsCodeService.sendSmsCodeText(plannerUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M6F3C81FE3,getUserId())) {
                    return R.ok("审核成功但短信发送失败!");
                }
            }else {
                User phoneUser = userService.selectById(nextUserId);
                if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
                if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
                    return R.ok("审核成功但短信发送失败!");
                }
            }

 src/main/java/com/zy/crm/manager/controller/PriOnline2Controller.java

@@ -625,7 +625,7 @@
                } catch (Exception e) {
                    return R.error("自动生成报价单失败");
                }
                if (!smsCodeService.sendSmsCodeText(manager.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
                if (!smsCodeService.sendSmsCodeText(manager.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
                    return R.ok("审批成功但短信发送失败!");
                }
            }else {
@@ -639,7 +639,7 @@
            }
        }else {
            User phoneUser = userService.selectById(nextUserId);
            if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
            if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
                return R.ok("审批成功但短信发送失败!");
            }
        }

 src/main/java/com/zy/crm/manager/controller/PriQuoteController.java

@@ -512,7 +512,7 @@
                    if (!priQuoteService.updateById(priQuote)) {
                        throw new CoolException("审核失败，请联系管理员");
                    }
                    if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
                    if (!smsCodeService.sendSmsCodeText(planLeader.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
                        return R.ok("审批成功但短信发送失败!");
                    }

@@ -561,7 +561,7 @@
                    throw new CoolException("审核失败，请联系管理员");
                }
                User phoneUser = userService.selectById(priQuote.getUserId());
                if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E)) {
                if (!smsCodeService.sendSmsCodeText(phoneUser.getMobile(), PhoneCodeTypeParam.ALIYUN_M1ABAC630E,getUserId())) {
                    return R.ok("审批成功但短信发送失败!");
                }
                break;

 src/main/java/com/zy/crm/manager/entity/SmsCode.java

@@ -68,6 +68,13 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date useTime;

    /**
     * 发送人
     */
    @ApiModelProperty(value= "发送人")
    @TableField("user_id")
    private Long userId;

    public SmsCode() {}

    public SmsCode(String phone,String code,Integer status,Date createTime,Date sendTime,Date useTime) {

 src/main/java/com/zy/crm/manager/service/SmsCodeService.java

@@ -10,7 +10,7 @@

    boolean sendSmsCode(String phone);
//    boolean sendSmsCodeText(String phone);
    boolean sendSmsCodeText(String phone, PhoneCodeTypeParam param);
    boolean sendSmsCodeText(String phone, PhoneCodeTypeParam param,Long userId);

    boolean verifySmsCode(String phone, String code);


 src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java

@@ -72,9 +72,9 @@
//    }

    @Override
    public boolean sendSmsCodeText(String phone, PhoneCodeTypeParam param) {
    public boolean sendSmsCodeText(String phone, PhoneCodeTypeParam param,Long userId) {
        Config config = configService.selectConfigByCode("SMSNotification");
        if (Cools.isEmpty(config) || config.getValue().equals("false")) {
        if (Cools.isEmpty(config) || !config.getValue().equals("true")) {
            return true;
        }
        String randomNum = param.code;
@@ -83,6 +83,7 @@
        smsCode.setCode(randomNum);
        smsCode.setStatus(0);
        smsCode.setCreateTime(new Date());
        smsCode.setUserId(userId);
        if (this.baseMapper.insert(smsCode) <= 0) {
            return false;
        }

 src/main/resources/mapper/SmsCodeMapper.xml

@@ -11,6 +11,7 @@
        <result column="create_time" property="createTime" />
        <result column="send_time" property="sendTime" />
        <result column="use_time" property="useTime" />
        <result column="user_id" property="userId" />

    </resultMap>