Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
ea76dfab3b
|
|
@ -47,11 +47,7 @@ import java.util.*;
|
|||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Description: 空单注册控制器
|
||||
* @Author: jiang chao
|
||||
* @Time: 2023/6/16 16:58
|
||||
* @Classname: CuMemberEmptyController
|
||||
* @PackageName: com.hzs.member.empty.controller.manage
|
||||
* 空单注册控制器
|
||||
*/
|
||||
@RequestMapping("/manage/member-empty")
|
||||
@RestController
|
||||
|
|
|
|||
|
|
@ -9,11 +9,7 @@ import java.math.BigDecimal;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 空单注册明细DTO
|
||||
* @Author: jiang chao
|
||||
* @Time: 2023/6/16 17:52
|
||||
* @Classname: CuMemberEmptyDetailVO
|
||||
* @PackageName: com.hzs.member.empty.vo
|
||||
* 空单注册明细DTO
|
||||
*/
|
||||
@Data
|
||||
public class MemberEmptyDetailDTO {
|
||||
|
|
|
|||
|
|
@ -5,11 +5,7 @@ import lombok.Data;
|
|||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* @Description: 空单免签入参
|
||||
* @Author: jiang chao
|
||||
* @Time: 2023/7/10 14:47
|
||||
* @Classname: MemberEmptyFreeSignParam
|
||||
* @PackageName: com.hzs.member.empty.param
|
||||
* 空单免签入参
|
||||
*/
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import com.hzs.common.core.constant.MagicNumberConstants;
|
|||
import com.hzs.common.core.constant.msg.ConfigMsgConstants;
|
||||
import com.hzs.common.core.constant.msg.FinanceMsgConstants;
|
||||
import com.hzs.common.core.enums.EApprovalBusiness;
|
||||
import com.hzs.common.core.enums.ESmsTemplate;
|
||||
import com.hzs.common.core.utils.StringUtils;
|
||||
import com.hzs.common.core.web.controller.BaseController;
|
||||
import com.hzs.common.core.web.domain.AjaxResult;
|
||||
|
|
@ -18,7 +17,7 @@ import com.hzs.member.account.vo.CuMemberAuthenticationVO;
|
|||
import com.hzs.member.base.service.ICuMemberService;
|
||||
import com.hzs.member.self.service.ICuSelfServiceLogService;
|
||||
import com.hzs.member.self.vo.DomicileChangeVO;
|
||||
import com.hzs.member.sms.service.impl.ApiSmsServiceImpl;
|
||||
import com.hzs.member.sms.service.IApiAliSmsService;
|
||||
import com.hzs.system.config.IServiceChargeServiceApi;
|
||||
import com.hzs.system.config.dto.ServiceChargeDTO;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
|
@ -42,7 +41,7 @@ public class ApiDomicileChangeController extends BaseController {
|
|||
@Autowired
|
||||
private ICuMemberService iCuMemberService;
|
||||
@Autowired
|
||||
private ApiSmsServiceImpl apiSmsService;
|
||||
private IApiAliSmsService iApiAliSmsService;
|
||||
@Autowired
|
||||
private ICuSelfServiceLogService iCuSelfServiceLogService;
|
||||
|
||||
|
|
@ -131,9 +130,8 @@ public class ApiDomicileChangeController extends BaseController {
|
|||
if (!existApprovalData.equals(AjaxResult.success())) {
|
||||
return existApprovalData;
|
||||
}
|
||||
//验证码校验
|
||||
String key = ESmsTemplate.VERIFICATION.getCache() + pkMember;
|
||||
String message = apiSmsService.checkSms(key, domicileChangeVO.getVerificationCode());
|
||||
// 校验短信验证码
|
||||
String message = iApiAliSmsService.checkCode(domicileChangeVO.getChangePhone(), domicileChangeVO.getVerificationCode(), null);
|
||||
if (null != message) {
|
||||
return AjaxResult.error(message);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,11 @@
|
|||
package com.hzs.member.self.vo;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.hzs.common.core.annotation.Transaction;
|
||||
import com.hzs.common.core.constant.EnumsPrefixConstants;
|
||||
import com.hzs.common.core.web.domain.BaseApprovalEntity;
|
||||
import com.hzs.member.base.dto.LoginMember;
|
||||
import com.hzs.system.sys.dto.LoginUser;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.*;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -18,13 +13,8 @@ import java.util.Date;
|
|||
|
||||
/**
|
||||
* 户籍变更VO
|
||||
*
|
||||
* @Description:
|
||||
* @Author: ljc
|
||||
* @Time: 2023/4/18 10:17
|
||||
* @Classname: DomicileChangeVO
|
||||
* @Package_name: com.hzs.member.self.vo
|
||||
*/
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Data
|
||||
@Builder
|
||||
@AllArgsConstructor
|
||||
|
|
@ -164,7 +154,7 @@ public class DomicileChangeVO extends BaseApprovalEntity implements Serializable
|
|||
/**
|
||||
* 驳回信息
|
||||
*/
|
||||
private String rejectMsg;
|
||||
private String rejectMsg;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
package com.hzs.member.sms.service;
|
||||
|
||||
/**
|
||||
* @Description: 阿里短信发送服务
|
||||
* @Author: jiang chao
|
||||
* @Time: 2024/12/19 16:30
|
||||
* @Classname: IApiAliSmsService
|
||||
* @PackageName: com.hzs.member.sms.service
|
||||
* 阿里短信发送服务
|
||||
*/
|
||||
public interface IApiAliSmsService {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
package com.hzs.member.sms.service;
|
||||
|
||||
/**
|
||||
* @Description: 短信处理服务
|
||||
* @Author: jiang chao
|
||||
* @Time: 2023/3/8 15:55
|
||||
* @Classname: ISmsService
|
||||
* @PackageName: com.hzs.member.sms.service
|
||||
*/
|
||||
public interface IApiSmsService {
|
||||
|
||||
/**
|
||||
* 校验验证码
|
||||
*
|
||||
* @param cacheKey 验证码缓存key
|
||||
* @param code 验证码
|
||||
* @return 如果返回null为正确，其它为错误内容
|
||||
*/
|
||||
String checkSms(String cacheKey, String code);
|
||||
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
package com.hzs.member.sms.service.impl;
|
||||
|
||||
import com.hzs.common.core.config.BdConfig;
|
||||
import com.hzs.common.core.constant.msg.SystemMsgConstants;
|
||||
import com.hzs.common.core.enums.EEnv;
|
||||
import com.hzs.common.core.service.RedisService;
|
||||
import com.hzs.common.util.TransactionUtils;
|
||||
import com.hzs.member.sms.service.IApiSmsService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* 短信处理服务
|
||||
*/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class ApiSmsServiceImpl implements IApiSmsService {
|
||||
|
||||
@Autowired
|
||||
private RedisService redisService;
|
||||
|
||||
@Override
|
||||
public String checkSms(String cacheKey, String code) {
|
||||
if (EEnv.TEST.getValue().equals(BdConfig.getEnv()) && "ASDF".equals(code)) {
|
||||
// 测试环境暂时不发放短信
|
||||
return null;
|
||||
}
|
||||
Object codeObj = redisService.getCacheObject(cacheKey);
|
||||
if (null != codeObj) {
|
||||
if (codeObj.toString().equals(code)) {
|
||||
// 校验正确之后，删除缓存
|
||||
redisService.deleteObject(cacheKey);
|
||||
return null;
|
||||
} else {
|
||||
// 验证码错误
|
||||
return TransactionUtils.getContent(SystemMsgConstants.CODE_ERROR);
|
||||
}
|
||||
}
|
||||
// 验证码已失效
|
||||
return TransactionUtils.getContent(SystemMsgConstants.CODE_EXPIRE);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -123,7 +123,8 @@
|
|||
#{item.recAddress, jdbcType=VARCHAR} rec_address,
|
||||
#{item.contentAbstract, jdbcType=VARCHAR} content_abstract,
|
||||
#{item.productFlag} product_flag,
|
||||
#{item.orderType} order_type
|
||||
#{item.orderType} order_type,
|
||||
#{item.autoFlag} auto_flag
|
||||
from dual
|
||||
</foreach>
|
||||
) tmp
|
||||
|
|
@ -155,6 +156,7 @@
|
|||
cmed.product_flag = tmp.product_flag,
|
||||
cmed.order_type = tmp.order_type,
|
||||
cmed.pk_modified = #{userId},
|
||||
cmed.auto_flag = tmp.auto_flag,
|
||||
cmed.modified_time = sysdate
|
||||
</update>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,7 @@ import java.io.Serializable;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description: 审批基类
|
||||
* @Author: jiang chao
|
||||
* @Time: 2023/3/16 14:28
|
||||
* @Classname: BaseApprovalEntity
|
||||
* @PackageName: com.hzs.common.core.web.domain
|
||||
* 审批基类
|
||||
*/
|
||||
@Data
|
||||
public class BaseApprovalEntity implements Serializable {
|
||||
|
|
|
|||
|
|
@ -15,9 +15,6 @@ import lombok.experimental.Accessors;
|
|||
|
||||
/**
|
||||
* 空单批次明细
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2023-06-16
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
|
|
|
|||
Loading…
Reference in New Issue