From 6d16a3f2e221423e729c9c4c34363fe52c90ea73 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 26 May 2025 16:57:44 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=88=B7=E7=B1=8D=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BC=9A=E5=91=98=E7=AB=AF=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E9=9C=80=E8=A6=81=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/dto/BusinessCommissionDTO.java | 6 - .../member/account/dto/MemberAmountDTO.java | 6 - .../member/base/dto/MemberContinueDTO.java | 6 +- .../dto/AnalysisBusinessAppealParam.java | 9 +- .../handlebusiness/dto/MemberEmptyDTO.java | 6 +- .../member/self/ICuSelfServiceServiceApi.java | 25 -- .../member/self/dto/SelfModifyAddressDTO.java | 199 ------------ .../member/self/dto/SelfServiceDataDTO.java | 42 --- .../hzs/system/sys/IApprovalServiceApi.java | 6 +- .../sys/dto/ApprovalBusinessResultDTO.java | 6 +- .../hzs/system/sys/dto/ApprovalSubmitDTO.java | 6 +- .../hzs/system/sys/dto/BusinessLogDTO.java | 6 +- .../member/base/mapper/CuMemberMapper.java | 5 - .../member/base/service/ICuMemberService.java | 2 - .../service/impl/CuMemberServiceImpl.java | 5 - .../api/ApiDomicileChangeController.java | 108 +------ .../manage/DomicileChangeController.java | 48 --- .../self/mapper/CuSelfServiceLogMapper.java | 20 -- .../ICuSelfServiceServiceProvider.java | 90 ------ .../service/ICuSelfServiceLogService.java | 51 --- .../impl/CuSelfServiceLogServiceImpl.java | 295 ++++-------------- .../mapper/member/base/CuMemberMapper.xml | 6 - .../member/self/CuSelfServiceLogMapper.xml | 35 --- .../manage/SysApprovalBusinessController.java | 15 - .../sys/service/impl/ApprovalServiceImpl.java | 8 +- .../core/constant/msg/ConfigMsgConstants.java | 8 - .../common/core/enums/EApprovalBusiness.java | 8 +- .../hzs/common/core/enums/ESignSource.java | 6 +- 28 files changed, 79 insertions(+), 954 deletions(-) delete mode 100644 bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java delete mode 100644 bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java delete mode 100644 bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java delete mode 100644 bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java index 0b80d858..4e92b831 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/BusinessCommissionDTO.java @@ -10,12 +10,6 @@ import java.util.List; /** * 业务手续费扣款 - * - * @Description: - * @Author: ljc - * @Time: 2023/1/6 15:15 - * @Classname: BusinessCommissionDTO - * @Package_name: com.hzs.member.account.dto */ @Data @Builder diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java index 280c1bc8..b18f7b82 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/dto/MemberAmountDTO.java @@ -10,12 +10,6 @@ import java.math.BigDecimal; /** * 会员业务手续费 - * - * @Description: - * @Author: ljc - * @Time: 2023/1/6 15:15 - * @Classname: BusinessCommissionDTO - * @Package_name: com.hzs.member.account.dto */ @Data @Builder diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/MemberContinueDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/MemberContinueDTO.java index f8013fc3..7b868dfd 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/MemberContinueDTO.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/MemberContinueDTO.java @@ -8,11 +8,7 @@ import java.io.Serializable; import java.util.List; /** - * @Description: 会员续约数据传输DTO - * @Author: jiang chao - * @Time: 2024/5/30 11:18 - * @Classname: MemberContinueDTO - * @PackageName: com.hzs.third.mq.dto + * 会员续约数据传输DTO */ @Builder @Data diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java index c0c4c938..458acab3 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/AnalysisBusinessAppealParam.java @@ -7,13 +7,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/1/30 14:30 - * @Classname: AnalysisBusinessAppealParam - * @PackageName: com.hzs.member.handleBusiness.dto - */ @Data @Builder @AllArgsConstructor @@ -23,7 +16,7 @@ public class AnalysisBusinessAppealParam implements Serializable { private static final long serialVersionUID = -5213723839597032413L; /** - * 批次单号（大单号） + * 批次单号（大单号） */ private String orderNumber; /** diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java index 0496ddfd..1eb30594 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MemberEmptyDTO.java @@ -9,11 +9,7 @@ import java.io.Serializable; import java.util.Date; /** - * @Description: 空单注册DTO - * @Author: jiang chao - * @Time: 2023/7/26 13:47 - * @Classname: EmptyMemberDTO - * @PackageName: com.hzs.member.handlebusiness.dto + * 空单注册DTO */ @AllArgsConstructor @NoArgsConstructor diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java deleted file mode 100644 index a365c3b8..00000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.hzs.member.self; - -import com.hzs.common.core.domain.R; -import com.hzs.member.self.dto.SelfServiceDataDTO; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; - -/** - * 自助服务 - */ -public interface ICuSelfServiceServiceApi { - - /** - * 解析自助服务数据 - * - * @param selfServiceDataDTO - * @return R - */ - R analysisSelfServiceData(SelfServiceDataDTO selfServiceDataDTO); - - - /** - * 在线签呈 （审批状态） 同意/驳回 - */ - R onlineApproval(ApprovalBusinessResultDTO approvalBusinessResultDTO); -} diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java deleted file mode 100644 index 4c46d423..00000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfModifyAddressDTO.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.hzs.member.self.dto; - -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.account.dto.MemberAmountDTO; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; -import java.util.List; -import java.util.Set; - -/** - *

- * 自助服务日志表VO - *

- * - * @author hzs - * @since 2023-04-17 - */ -@Data -public class SelfModifyAddressDTO extends BaseApprovalEntity { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员主键 - */ - private Long pkMember; - - /** - * 审批业务类型来源于 枚举： EApprovalBusiness - */ - private Integer editType; - - /** - * 原值 - */ - private String oldValue; - - /** - * 新值 - */ - private String newValue; - - /** - * 业务单号 - */ - private String businessNo; - - /** - * 审核状态 0 待审核 1 审核通过 2 审核驳回 枚举 ： EModifyRecordStatus - */ - private Integer approveStatus; - - /** - * 审核次数 - */ - private Integer approveNumber; - - /** - * 支付业务类型来源于枚举 - */ - private Integer editTypePay; - - /** - * 扣费金额 - */ - private BigDecimal singleAmount; - - - /** - * 订单编号 - */ - private String orderCode; - /** - * 订单id - */ - private Long pkOrder; - - /** - * 创建人ID - */ - private Long pkCreator; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - private Integer delFlag; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 支付时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; - /** - * 收货地址ID - */ - private Long pkReceiving; - /** - * 收货人 - */ - private String recName; - /** - * 手机 - */ - private String recPhone; - - /** - * 收货省 - */ - private Integer recProvince; - /** - * 收货市 - */ - private Integer recCity; - /** - * 收货县 - */ - private Integer recCounty; - /** - * 详细地址 - */ - private String recAddress; - - /** - * 会员手续费 - */ - List memberAmountDTOList; - /** - * 错误信息 - */ - private String errorMsg; - /** - * 业务涉及会员ID列表 -- 提交审核必传 - */ - private Set pkMemberList; - /** - * 旧邮费 - */ - private BigDecimal oldPostage; - /** - * 新邮费 - */ - private BigDecimal newPostage; - /** - * 邮费 - */ - private BigDecimal postage; - /** - * 备注 - */ - private String selfRemark; - /** - * 扣款币种类型 - */ - private Integer pkAccount; - /** - * 扣款币种翻译key - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_ACC) - private Integer pkAccountKey; - /** - * 扣款币种翻译 - */ - private String pkAccountKeyVal; - - - -} diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java deleted file mode 100644 index 2fc55068..00000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/self/dto/SelfServiceDataDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hzs.member.self.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 自助服务解析DTO - * - * @Description: - * @Author: ljc - * @Time: 2023/4/19 16:20 - * @Classname: selfServiceDataDTO - * @Package_name: com.hzs.member.self.dto - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class SelfServiceDataDTO implements Serializable { - private static final long serialVersionUID = -7391351591016186401L; - - - /** - * 业务单号 - */ - - private String businessNo; - - /** - * 业务类型 - */ - private Integer editType; - - /** - * 国家 - */ - private Integer pkCountry; -} diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IApprovalServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IApprovalServiceApi.java index 4084dba9..e91a0ee2 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IApprovalServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/IApprovalServiceApi.java @@ -7,11 +7,7 @@ import java.util.List; import java.util.Map; /** - * Description: 审批服务接口 - * Author: jiang chao - * Time: 2022/10/9 11:24 - * Classname: IApprovalServiceApi - * PackageName: com.hzs.system.sys + * 审批服务接口 */ public interface IApprovalServiceApi { diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalBusinessResultDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalBusinessResultDTO.java index 6608bc38..d82dd3e8 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalBusinessResultDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalBusinessResultDTO.java @@ -12,11 +12,7 @@ import java.io.Serializable; import java.util.Date; /** - * Description: 业务审批操作DTO - * Author: jiang chao - * Time: 2022/9/24 16:49 - * Classname: ApprovalBusiness - * PackageName: com.hzs.system.sys.dto + * 业务审批操作DTO */ @AllArgsConstructor @NoArgsConstructor diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSubmitDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSubmitDTO.java index 6d8b10d1..304749a5 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSubmitDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/ApprovalSubmitDTO.java @@ -13,11 +13,7 @@ import java.util.List; import java.util.Set; /** - * @Description: 审批提交DTO - * @Author: jiang chao - * @Time: 2022/10/25 11:10 - * @Classname: ApprovalSubmitDTO - * @PackageName: com.hzs.system.sys.dto + * 审批提交DTO */ @AllArgsConstructor @NoArgsConstructor diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java index 53642b2c..3a165adf 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/sys/dto/BusinessLogDTO.java @@ -8,11 +8,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; /** - * @Description: 业务操作日志DTO - * @Author: jiang chao - * @Time: 2023/8/2 11:30 - * @Classname: BusinessLogDTO - * @PackageName: com.hzs.system.sys.dto + * 业务操作日志DTO */ @Builder @NoArgsConstructor diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java index 869dd86f..c4428ba1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java @@ -530,11 +530,6 @@ public interface CuMemberMapper extends BaseMapper { **/ List queryCuMemberUnderUmbrella(@Param("pkMember") Long pkMember); - /** - * @description: 校验会员是否存在三方订单 - **/ - Integer checkThreeOrder(@Param("pkMember") Long pkMember); - /** * 校验新安置部门和安置编号下是否已存在节点 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java index 4c2ae584..d286f5e1 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java @@ -787,8 +787,6 @@ public interface ICuMemberService extends IService { **/ Boolean queryCuMemberUnderUmbrella(Long pkMember); - Integer checkThreeOrder(Long pkMember); - /** * 校验新安置部门和安置编号下是否已存在节点 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index 031314f2..51ed2547 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -3365,11 +3365,6 @@ public class CuMemberServiceImpl extends ServiceImpl i return cuMemberList != null && cuMemberList.size() > 0; } - @Override - public Integer checkThreeOrder(Long pkMember) { - return baseMapper.checkThreeOrder(pkMember); - } - @Override public Long checkPlaceDeptAndMemberCode(String placeDeptMemberCode, Integer placeDept) { return baseMapper.checkPlaceDeptAndMemberCode(placeDeptMemberCode, placeDept); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java index ec77a74b..1bd21cc5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java @@ -1,37 +1,25 @@ package com.hzs.member.self.controller.api; -import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.annotation.RepeatSubmitSimple; 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.utils.StringUtils; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.member.ext.CuMemberExt; -import com.hzs.common.domain.member.self.CuSelfServiceLog; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.util.TransactionUtils; -import com.hzs.member.account.dto.BusinessCommissionDTO; -import com.hzs.member.account.dto.MemberAmountDTO; -import com.hzs.member.account.dto.MemberBalanceDTO; import com.hzs.member.account.service.ICuMemberAuthenticationService; -import com.hzs.member.account.service.ICuMemberTradeService; 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.IApiAliSmsService; -import com.hzs.system.config.IServiceChargeServiceApi; -import com.hzs.system.config.dto.ServiceChargeDTO; import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.List; /** @@ -47,15 +35,10 @@ public class ApiDomicileChangeController extends BaseController { @Autowired private ICuMemberService iCuMemberService; @Autowired - private ICuMemberTradeService iCuMemberTradeService; - @Autowired private ICuSelfServiceLogService iCuSelfServiceLogService; @Autowired private IApiAliSmsService iApiAliSmsService; - @DubboReference - IServiceChargeServiceApi iServiceChargeServiceApi; - /** * 查询可申请信息 * @@ -77,29 +60,6 @@ public class ApiDomicileChangeController extends BaseController { return AjaxResult.success(iCuSelfServiceLogService.selectDomicileChangeByPkMember(SecurityUtils.getUserId(), EApprovalBusiness.DOMICILE_CHANGE.getValue(), SecurityUtils.getPkCountry())); } - /** - * 查询已申请信息 - * - * @return AjaxResult - */ - @GetMapping("/applied-info-list") - public AjaxResult appliedInformation() { - DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().pkMember(SecurityUtils.getUserId()) - .pkCountry(SecurityUtils.getPkCountry()).editType(EApprovalBusiness.DOMICILE_CHANGE.getValue()).build(); - List domicileChangeVOList = (List) iCuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1]; - return AjaxResult.success(domicileChangeVOList); - } - - /** - * 自助服务是否显示户籍认证 - * - * @return AjaxResult - */ - @GetMapping("/show-index-domicile") - public AjaxResult showIndexDomicile() { - return AjaxResult.success(iCuSelfServiceLogService.showIndexDomicile(SecurityUtils.getPkCountry(), SecurityUtils.getUserId())); - } - /** * 申请户籍变更 * @@ -131,17 +91,7 @@ public class ApiDomicileChangeController extends BaseController { } domicileChangeVO.setPkCountry(pkCountry); domicileChangeVO.setPkMember(pkMember); - //是否有正在审批业务 - AjaxResult existApprovalData = isExistApprovalData(domicileChangeVO); - if (!existApprovalData.equals(AjaxResult.success())) { - return existApprovalData; - } - //余额是否充足 - AjaxResult accountBalance = isAccountBalance(domicileChangeVO); - if (!accountBalance.equals(AjaxResult.success())) { - return accountBalance; - } - //验证码校验 + // 验证码校验 String message = iApiAliSmsService.checkCode(null, domicileChangeVO.getVerificationCode(), null, pkMember); if (null != message) { return AjaxResult.error(message); @@ -149,7 +99,6 @@ public class ApiDomicileChangeController extends BaseController { return toAjax(iCuSelfServiceLogService.saveChangeDomicile(domicileChangeVO)); } - /** * 显示户籍变更信息 * @@ -169,62 +118,23 @@ public class ApiDomicileChangeController extends BaseController { idBack = cuMemberAuthenticationVO.getIdBack(); idFront = cuMemberAuthenticationVO.getIdFront(); } - ServiceChargeDTO serviceChargeInfo = getServiceChargeInfo(pkCountry); - BigDecimal cost = null != serviceChargeInfo ? serviceChargeInfo.getCost() : BigDecimal.ZERO; DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().memberCode(member.getMemberCode()) - .memberName(member.getMemberName()).phone(member.getPhone()).amount(cost).pkAccount(serviceChargeInfo.getPkAccount()) + .memberName(member.getMemberName()).phone(member.getPhone()) .idBack(idBack).idFront(idFront).build(); return AjaxResult.success(domicileChangeVO); } /** - * 是否存在审核的数据 + * 查询已申请信息 * - * @param domicileChangeVO 户籍变更信息 * @return AjaxResult */ - private AjaxResult isExistApprovalData(DomicileChangeVO domicileChangeVO) { - CuSelfServiceLog cuSelfServiceLog = new CuSelfServiceLog(); - cuSelfServiceLog.setPkCountry(domicileChangeVO.getPkCountry()); - cuSelfServiceLog.setEditType(EApprovalBusiness.DOMICILE_CHANGE.getValue()); - cuSelfServiceLog.setPkMember(domicileChangeVO.getPkMember()); - Integer check = iCuSelfServiceLogService.checkSelfService(cuSelfServiceLog); - if (check > 0) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)); - } - return AjaxResult.success(); - } - - /** - * 查询手续费 - * - * @param pkCountry 国家pID - * @return ServiceChargeDTO - */ - private ServiceChargeDTO getServiceChargeInfo(Integer pkCountry) { - //查询扣费金额，账户信息 - ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); - serviceChargeDTO.setType(EApprovalBusiness.DOMICILE_CHANGE.getValue()); - serviceChargeDTO.setPkCountry(pkCountry); - serviceChargeDTO.setQuantity(MagicNumberConstants.CHANGE_NUM); - return iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO).getData(); - } - - /** - * 查询余额是否充足 - * - * @param domicileChangeVO 户籍变更信息 - * @return AjaxResult - */ - private AjaxResult isAccountBalance(DomicileChangeVO domicileChangeVO) { - List memberAmountDTOList = new ArrayList<>(); - memberAmountDTOList.add(MemberAmountDTO.builder().pkMember(domicileChangeVO.getPkMember()).tradeAmount(domicileChangeVO.getAmount()).build()); - BusinessCommissionDTO businessCommissionDTO = BusinessCommissionDTO.builder().pkAccount(domicileChangeVO.getPkAccount()).memberAmountDTOList(memberAmountDTOList).build(); - List memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO); - if (CollectionUtil.isNotEmpty(memberBalanceList)) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT)); - } - return AjaxResult.success(); + @GetMapping("/applied-info-list") + public AjaxResult appliedInformation() { + DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().pkMember(SecurityUtils.getUserId()) + .pkCountry(SecurityUtils.getPkCountry()).editType(EApprovalBusiness.DOMICILE_CHANGE.getValue()).build(); + List domicileChangeVOList = (List) iCuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1]; + return AjaxResult.success(domicileChangeVOList); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java index b90b45c7..00cfc955 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/DomicileChangeController.java @@ -1,24 +1,18 @@ package com.hzs.member.self.controller.manage; - import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.enums.EApprovalBusiness; import com.hzs.common.core.enums.EOperationBusiness; import com.hzs.common.core.enums.EOperationMethod; import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.member.self.CuSelfServiceLogExt; -import com.hzs.common.security.service.UserTokenService; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; import com.hzs.member.self.service.ICuSelfServiceLogService; import com.hzs.member.self.vo.DomicileChangeVO; -import com.hzs.system.sys.dto.LoginUser; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -28,12 +22,6 @@ import java.util.List; /** * 变理户籍 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/18 10:07 - * @Classname: ApiDomicileChangeController - * @Package_name: com.hzs.member.self.controller.api */ @Slf4j @RequestMapping("/manage/change-domicile") @@ -43,10 +31,6 @@ public class DomicileChangeController extends BaseController { @Autowired private ICuSelfServiceLogService serviceLogService; - @Autowired - private UserTokenService userTokenService; - - /** * 户籍变更列表 * @@ -64,7 +48,6 @@ public class DomicileChangeController extends BaseController { return tableDataInfo; } - /** * 户籍变更列表 * @@ -77,35 +60,4 @@ public class DomicileChangeController extends BaseController { } - /** - * 驳回 - * - * @return AjaxResult - */ - @PostMapping("/domicile-change-reject") - @Log(module = EOperationModule.DOMICILE_CHANGE, business = EOperationBusiness.DOMICILE_CHANGE, method = EOperationMethod.REJECT) - public AjaxResult domicileChangeReject(@RequestBody DomicileChangeVO domicileChangeVO) { - if (StringUtils.isEmpty(domicileChangeVO.getRejectMsg())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.REJECT_MSG_NOT_NULL)); - } - return AjaxResult.success(serviceLogService.domicileChangeRejectById(domicileChangeVO, SecurityUtils.getUserId())); - } - - - /** - * 同意 - * - * @return AjaxResult - */ - @PostMapping("/domicile-change-agree") - @Log(module = EOperationModule.DOMICILE_CHANGE, business = EOperationBusiness.DOMICILE_CHANGE, method = EOperationMethod.AGREE) - public AjaxResult domicileChangeAgree(@RequestBody DomicileChangeVO domicileChangeVO) { - LoginUser loginUser = userTokenService.getLoginUser(); - domicileChangeVO.setLoginUser(loginUser); - domicileChangeVO.setPkModified(SecurityUtils.getUserId()); - domicileChangeVO.setPkCountry(SecurityUtils.getPkCountry()); - return AjaxResult.success(serviceLogService.domicileChangeAgree(domicileChangeVO)); - } - - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java index fe7606bc..e8642fe8 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java @@ -25,11 +25,6 @@ public interface CuSelfServiceLogMapper extends BaseMapper { **/ List querySelfModifyAddressManageList(SelfModifyAddressVO selfModifyAddressVO); - /** - * 自助服务-校验是否存在重复审核 - **/ - Integer checkSelfService(CuSelfServiceLog cuSelfServiceLog); - /** * 自助服务-查询申请的最大次数 **/ @@ -61,21 +56,6 @@ public interface CuSelfServiceLogMapper extends BaseMapper { */ CuSelfServiceLogExt selectDomicileChangeByPkMember(@Param("editType") Integer editType, @Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry); - /** - * 根据业务类型、业务编号查询自助信息 - * - * @param editType 业务类型 - * @param businessNo 业务编号 - * @return CuSelfServiceLog - */ - CuSelfServiceLog selectSelfServiceByBusinessNo(@Param("editType") Integer editType, @Param("businessNo") String businessNo); - - /** - * 根据业务编号更新审批信息 - */ - - Integer updateSelfServiceByBusinessNo(DomicileChangeVO domicileChangeVO); - /** * 根据订单ID查询订单明细列表（前台使用，尽量只查能用到的） * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java deleted file mode 100644 index 3fc70443..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.hzs.member.self.provider; - -import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.common.core.enums.EModifyRecordStatus; -import com.hzs.common.core.utils.StringUtils; - -import com.hzs.common.domain.member.self.CuSelfServiceLog; -import com.hzs.member.self.ICuSelfServiceServiceApi; -import com.hzs.member.self.dto.SelfServiceDataDTO; -import com.hzs.member.self.service.ICuSelfServiceLogService; -import com.hzs.member.self.vo.DomicileChangeVO; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import lombok.extern.slf4j.Slf4j; -import org.apache.dubbo.config.annotation.DubboService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.List; - -/** - * 自助服务Dubbo 服务 - */ -@Slf4j -@DubboService -public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi { - - @Autowired - private ICuSelfServiceLogService iCuSelfServiceLogService; - - @Override - public R analysisSelfServiceData(SelfServiceDataDTO selfServiceDataDTO) { - EApprovalBusiness eApprovalBusiness = EApprovalBusiness.getEnumByValue(selfServiceDataDTO.getEditType()); - switch (eApprovalBusiness) { - case DOMICILE_CHANGE: - //户籍变更数据 - return R.ok(getDomicileChangeData(selfServiceDataDTO)); - default: - return R.fail(); - } - } - - /** - * 户籍变更数据 - * - * @param selfServiceDataDTO 自助服务参数 - * @return List - */ - private List getDomicileChangeData(SelfServiceDataDTO selfServiceDataDTO) { - DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().editType(selfServiceDataDTO.getEditType()) - .pkCountry(selfServiceDataDTO.getPkCountry()) - .businessNo(selfServiceDataDTO.getBusinessNo()).build(); - return (List) iCuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1]; - } - - @Override - public R onlineApproval(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - //通过/驳回（EApproveOperation） - Integer approveOperation = approvalBusinessResultDTO.getApproveOperation(); - EApprovalBusiness eApprovalBusiness = approvalBusinessResultDTO.getEApprovalBusiness(); - String businessCode = approvalBusinessResultDTO.getBusinessCode(); - if (StringUtils.isEmpty(businessCode) || null == approveOperation || null == eApprovalBusiness) { - return R.fail("提交审核缺少参数！"); - } - CuSelfServiceLog selfServiceLog = iCuSelfServiceLogService.selectSelfServiceByBusinessNo(eApprovalBusiness.getValue(), businessCode); - if (null == selfServiceLog) { - return R.fail("审批记录不存在！"); - } - try { - switch (eApprovalBusiness) { - //户籍变更数据 - case DOMICILE_CHANGE: - //审批通过 - if (approveOperation.equals(EModifyRecordStatus.APPROVE.getValue())) { - return R.ok(iCuSelfServiceLogService.domicileChangeApproved(approvalBusinessResultDTO, selfServiceLog)); - } - //审批驳回 - if (approveOperation.equals(EModifyRecordStatus.REJECT.getValue())) { - //横冲手续费 - return R.ok(iCuSelfServiceLogService.domicileChangeReject(approvalBusinessResultDTO, selfServiceLog)); - } - default: - return R.fail(); - } - } catch (Exception e) { - log.error("审核状态为： {} 的审核出错", approveOperation, e); - return R.fail("审批自助服务流程出错！"); - } - } - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java index b715281e..af5e0a1f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java @@ -5,7 +5,6 @@ import com.hzs.common.domain.member.self.CuSelfServiceLog; import com.hzs.member.self.vo.MyOrderItemsVO; import com.hzs.member.self.vo.SelfModifyAddressVO; import com.hzs.member.self.vo.DomicileChangeVO; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import java.util.List; @@ -24,11 +23,6 @@ public interface ICuSelfServiceLogService extends IService { **/ List querySelfModifyAddressManageList(SelfModifyAddressVO selfModifyAddressVO); - /** - * 自助服务-校验是否存在重复审核 - **/ - Integer checkSelfService(CuSelfServiceLog cuSelfServiceLog); - Integer selectByMaxApproveNumber(CuSelfServiceLog cuSelfServiceLog); /** @@ -79,51 +73,6 @@ public interface ICuSelfServiceLogService extends IService { */ DomicileChangeVO selectDomicileChangeByPkMember(Long pkMember, Integer editType, Integer pkCountry); - - /** - * 根据业务类型、业务编号查询自助信息 - * - * @param editType 业务类型 - * @param businessNo 业务编号 - * @return CuSelfServiceLog - */ - CuSelfServiceLog selectSelfServiceByBusinessNo(Integer editType, String businessNo); - - /** - * 户籍变更审批通过 - * - * @param approvalBusinessResultDTO 审核参数 - * @param selfServiceLog 自助信息 - * @return Boolean - */ - Integer domicileChangeApproved(ApprovalBusinessResultDTO approvalBusinessResultDTO, CuSelfServiceLog selfServiceLog); - - /** - * 户籍变更审批驳回 - * - * @param approvalBusinessResultDTO 审核参数 - * @param selfServiceLog 自助信息 - * @return Integer - */ - Integer domicileChangeReject(ApprovalBusinessResultDTO approvalBusinessResultDTO, CuSelfServiceLog selfServiceLog); - - /** - * 户籍变更审批驳回 - * - * @param domicileChangeVO ID - * @param pkMember 会员ID - * @return Integer - */ - Boolean domicileChangeRejectById(DomicileChangeVO domicileChangeVO, Long pkMember); - - /** - * 户籍变更审批同意（后台列表操作） - * - * @param domicileChangeVO 户籍变更 - * @return - */ - Integer domicileChangeAgree(DomicileChangeVO domicileChangeVO); - List queryListByOrderId(List orderIdList); /** diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java index 77b92c41..3731baf0 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java @@ -3,25 +3,18 @@ package com.hzs.member.self.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.MagicNumberConstants; -import com.hzs.common.core.constant.RabbitMqConstants; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; import com.hzs.common.core.utils.CommonUtil; import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.member.self.CuSelfServiceLog; import com.hzs.common.domain.member.self.CuSelfServiceLogExt; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.member.account.dto.BusinessCommissionDTO; -import com.hzs.member.account.dto.MemberAmountDTO; import com.hzs.member.account.service.*; -import com.hzs.member.base.dto.MemberContinueDTO; import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.handlebusiness.vo.BusinessMemberVO; import com.hzs.member.self.mapper.CuSelfServiceLogMapper; @@ -30,12 +23,7 @@ import com.hzs.member.self.vo.DomicileChangeVO; import com.hzs.member.self.vo.MyOrderItemsVO; import com.hzs.member.self.vo.SelfModifyAddressVO; import com.hzs.sale.order.ISaOrderServiceApi; -import com.hzs.system.sys.IApprovalServiceApi; -import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import com.hzs.system.sys.dto.ApprovalSubmitDTO; -import com.hzs.system.sys.dto.BusinessLogDTO; import org.apache.dubbo.config.annotation.DubboReference; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -51,25 +39,17 @@ import java.util.List; @Service public class CuSelfServiceLogServiceImpl extends ServiceImpl implements ICuSelfServiceLogService { - @DubboReference - IApprovalServiceApi approvalServiceApi; @DubboReference ISaOrderServiceApi iSaOrderServiceApi; @Autowired - private ICuMemberTradeService cuMemberTradeService; + private ICuMemberAuthenticationService iCuMemberAuthenticationService; @Autowired - private ICuMemberBaseService cuMemberBaseService; + private ICuMemberBusinessLicenseService iCuMemberBusinessLicenseService; @Autowired - private ICuMemberAuthenticationService cuMemberAuthenticationService; + private ICuMemberService iCuMemberService; @Autowired - private ICuMemberBusinessLicenseService cuMemberBusinessLicenseService; - @Autowired - private ICuMemberService cuMemberService; - @Autowired - private ICuMemberBankService cuMemberBankService; - @Autowired - private RabbitTemplate rabbitTemplate; + private ICuMemberBankService iCuMemberBankService; @Override public List querySelfModifyAddressList(SelfModifyAddressVO selfModifyAddressVO) { @@ -81,16 +61,53 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl pkMembers = Collections.singletonList(businessMemberVO.getPkMember()); + iCuMemberService.updateMemberEditNumber(pkMembers, pkMember); + + //变更前值 + DomicileChangeVO oldValue = DomicileChangeVO.builder().memberName(domicileChangeVO.getMemberName()) + .phone(domicileChangeVO.getPhone()).idFront(domicileChangeVO.getIdFront()).idBack(domicileChangeVO.getIdBack()).build(); + //变更后的值 + DomicileChangeVO newValue = DomicileChangeVO.builder().changeMemberName(domicileChangeVO.getChangeMemberName()) + .changePhone(domicileChangeVO.getChangePhone()).changeIdFront(domicileChangeVO.getChangeIdFront()).changeIdBack(domicileChangeVO.getChangeIdBack()).build(); + String businessNo = CommonUtil.createSerialNumber(EOrderPrefix.SELF_SERVICE.getValue()); + CuSelfServiceLog oldServiceLog = CuSelfServiceLog.builder() + .pkMember(pkMember) + .editType(EApprovalBusiness.DOMICILE_CHANGE.getValue()) + .oldValue(JSONUtil.toJsonStr(oldValue)) + .newValue(JSONUtil.toJsonStr(newValue)) + .businessNo(businessNo) + .selfRemark(domicileChangeVO.getRemark()) + .description(domicileChangeVO.getDescription()) + .approveStatus(EApproveRechargeStatus.AGREE.getValue()) + .pkAccount(domicileChangeVO.getPkAccount()) + .approveNumber(MagicNumberConstants.CHANGE_NUM) + .singleAmount(domicileChangeVO.getAmount()) + .editTypePay(ETradeType.getValueByApprovalValue(EApprovalBusiness.DOMICILE_CHANGE.getValue())) + .build(); + oldServiceLog.setPkCreator(pkMember); + oldServiceLog.setPkCountry(CountryConstants.CHINA_COUNTRY); + return this.save(oldServiceLog); + } + @Override @Transactional(rollbackFor = Exception.class) public boolean putin(SelfModifyAddressVO selfModifyAddressVO) { @@ -154,117 +171,6 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EDelFlag.DELETE.getValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); - updateWrapper.eq("PK_ID", cuSelfServiceLogExt.getPkId()); - update(updateWrapper); - } - //变更前值 - DomicileChangeVO oldValue = DomicileChangeVO.builder().memberName(domicileChangeVO.getMemberName()) - .phone(domicileChangeVO.getPhone()).idFront(domicileChangeVO.getIdFront()).idBack(domicileChangeVO.getIdBack()).build(); - //变更后的值 - DomicileChangeVO newValue = DomicileChangeVO.builder().changeMemberName(domicileChangeVO.getChangeMemberName()) - .changePhone(domicileChangeVO.getChangePhone()).changeIdFront(domicileChangeVO.getChangeIdFront()).changeIdBack(domicileChangeVO.getChangeIdBack()).build(); - - String businessNo = CommonUtil.createSerialNumber(EOrderPrefix.SELF_SERVICE.getValue()); - CuSelfServiceLog oldServiceLog = CuSelfServiceLog.builder().pkMember(pkMember) - .editType(editType).oldValue(JSONUtil.toJsonStr(oldValue)).selfRemark(domicileChangeVO.getRemark()).description(domicileChangeVO.getDescription()) - .newValue(JSONUtil.toJsonStr(newValue)).businessNo(businessNo).approveStatus(EApproveRechargeStatus.SUBMIT.getValue()).pkAccount(domicileChangeVO.getPkAccount()) - .approveNumber(MagicNumberConstants.CHANGE_NUM).singleAmount(domicileChangeVO.getAmount()).editTypePay(ETradeType.getValueByApprovalValue(editType)).build(); - oldServiceLog.setPkCreator(pkMember); - oldServiceLog.setPkCountry(pkCountry); - //保存 - this.save(oldServiceLog); - //扣费 - return Charging(domicileChangeVO, businessNo); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Integer domicileChangeAgree(DomicileChangeVO domicileChangeVO) { - String businessNo = domicileChangeVO.getBusinessNo(); - Long pkMember = domicileChangeVO.getPkMember(); - Long pkModified = domicileChangeVO.getPkModified(); - //更新审核状态 - DomicileChangeVO domicileChange = DomicileChangeVO.builder().businessNo(businessNo) - .approveStatus(EApproveRechargeStatus.WAIT.getValue()).approveTime(new Date()) - .pkModified(pkModified).build(); - Integer result = baseMapper.updateSelfServiceByBusinessNo(domicileChange); - //调用审批接口，修改审批状态 - ApprovalSubmitDTO approvalSubmitDTO = ApprovalSubmitDTO.builder().eApprovalBusiness(EApprovalBusiness.DOMICILE_CHANGE) - .businessCode(businessNo).signSource(ESignSource.MANAGE) - .signType(ESignType.GENERAL).userIdList(domicileChangeVO.getUserIdList()) - .remark(domicileChangeVO.getRemark()).pkMemberList(Collections.singleton(pkMember)) - .sendIdList(domicileChangeVO.getSendIdList()).fileList(domicileChangeVO.getFileList()) - .build(); - R submit = approvalServiceApi.submit(approvalSubmitDTO, domicileChangeVO.getLoginUser()); - if (!submit.isSuccess()) { - throw new RuntimeException(submit.getMsg()); - } - //MQ户籍变更操作日志 - CuSelfServiceLog cuSelfServiceLog = baseMapper.selectSelfServiceByBusinessNo(EApprovalBusiness.DOMICILE_CHANGE.getValue(), businessNo); - packageDomicileOperationLog(cuSelfServiceLog, businessNo, "同意", pkModified, false); - return result; - } - - /** - * 户籍变更操作日志 - * - * @param cuSelfServiceLog 入参 - * @param businessNo 业务编号 - * @param operationType 操作类型 - */ - private void packageDomicileOperationLog(CuSelfServiceLog cuSelfServiceLog, String businessNo, String operationType, Long pkMember, Boolean freeSignFlag) { - DomicileChangeVO oldValue = JSONUtil.toBean(cuSelfServiceLog.getOldValue(), DomicileChangeVO.class); - DomicileChangeVO newValue = JSONUtil.toBean(cuSelfServiceLog.getNewValue(), DomicileChangeVO.class); - CuMemberExt cumember = cuMemberService.getMemberById(cuSelfServiceLog.getPkMember()); - String sb = "会员编号：" + cumember.getMemberCode() + - " 变更前的会员姓名：" + oldValue.getMemberName() + - " 变更后的会员姓名：" + newValue.getChangeMemberName() + - " 变更前的联系方式：" + oldValue.getPhone() + - " 变更后的联系方式：" + newValue.getChangePhone() + - " 操作类型：" + operationType; - BusinessLogDTO businessLog = BusinessLogDTO.builder() - .businessType(EApprovalBusiness.DOMICILE_CHANGE.getValue()) - .businessCode(businessNo).pkMember(cuSelfServiceLog.getPkMember()) - .content(sb).pkCreator(pkMember) - .pkCountry(cuSelfServiceLog.getPkCountry()) - .freeSignFlag(freeSignFlag).build(); - rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, Collections.singleton(businessLog)); - } - - - /** - * 扣费 - * - * @param domicileChangeVO 户籍变更信息 - * @param businessNo 业务编号 - */ - public Boolean Charging(DomicileChangeVO domicileChangeVO, String businessNo) { - MemberAmountDTO memberAmountDTO = MemberAmountDTO.builder().pkMember(domicileChangeVO.getPkMember()).tradeAmount(domicileChangeVO.getAmount()).build(); - List memberAmountDTOList = new ArrayList<>(); - memberAmountDTOList.add(memberAmountDTO); - - BusinessCommissionDTO businessCommissionDTO = BusinessCommissionDTO.builder().pkAccount(domicileChangeVO.getPkAccount()) - .tradeType(EApprovalBusiness.DOMICILE_CHANGE.getValue()) - .tradeCode(businessNo) - .pkCountry(domicileChangeVO.getPkCountry()) - .pkCreator(domicileChangeVO.getPkModified()).build(); - businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); - return cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO); - } - @Override public Object[] selectSelfServiceByPkMember(DomicileChangeVO domicileChangeVO) { @@ -282,11 +188,11 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_MEMBER", pkMember); - queryWrapper.eq("PK_COUNTRY", pkCountry); - queryWrapper.eq("EDIT_TYPE", EApprovalBusiness.DOMICILE_CHANGE.getValue()); - queryWrapper.eq("APPROVE_STATUS", EApproveRechargeStatus.AGREE.getValue()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuSelfServiceLog::getPkMember, pkMember); + queryWrapper.eq(CuSelfServiceLog::getPkCountry, pkCountry); + queryWrapper.eq(CuSelfServiceLog::getEditType, EApprovalBusiness.DOMICILE_CHANGE.getValue()); + queryWrapper.eq(CuSelfServiceLog::getApproveStatus, EApproveRechargeStatus.AGREE.getValue()); Integer count = baseMapper.selectCount(queryWrapper); return count > 0 ? EYesNo.NO.getIntValue() : EYesNo.YES.getIntValue(); } @@ -295,18 +201,14 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl pkMembers = Collections.singletonList(businessMemberVO.getPkMember()); - cuMemberService.updateMemberEditNumber(pkMembers, pkModified); - //修改会员续约的有效期 - MemberContinueDTO memberContinueDTO = MemberContinueDTO.builder().pkMemberList(Collections.singletonList(pkMember)) - .eMemberContinue(EMemberContinue.CHANGE_INFO).build(); - cuMemberBaseService.memberContinueMQ(Collections.singletonList(memberContinueDTO)); - //更新状态 - return updateApprovalStatus(approvalBusinessResultDTO, pkModified); } /** @@ -368,72 +240,19 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl pkMembers = Collections.singletonList(pkMember); //更新实名认证 - Boolean auth = cuMemberAuthenticationService.deleteByPkMembers(pkMembers, pkModified); + Boolean auth = iCuMemberAuthenticationService.deleteByPkMembers(pkMembers, pkModified); //更新会员是否实名 if (auth) { - cuMemberService.updateMemberStatusByPkIds(pkMembers, pkModified, EAuthType.REAL_NAME.getValue()); + iCuMemberService.updateMemberStatusByPkIds(pkMembers, pkModified, EAuthType.REAL_NAME.getValue()); } //更新营业执照 - Boolean license = cuMemberBusinessLicenseService.updateMemberLicenseByPkMembers(pkMembers, pkModified); + Boolean license = iCuMemberBusinessLicenseService.updateMemberLicenseByPkMembers(pkMembers, pkModified); //更新会员是否营业执照 if (license) { - cuMemberService.updateMemberStatusByPkIds(pkMembers, pkModified, EAuthType.BUS_LICENSE.getValue()); + iCuMemberService.updateMemberStatusByPkIds(pkMembers, pkModified, EAuthType.BUS_LICENSE.getValue()); } } - @Override - @Transactional(rollbackFor = Exception.class) - public Integer domicileChangeReject(ApprovalBusinessResultDTO approvalBusinessResultDTO, CuSelfServiceLog selfServiceLog) { - Long userId = approvalBusinessResultDTO.getLoginUser().getUserId(); - //扣费横冲 - EApprovalBusiness eApprovalBusiness = approvalBusinessResultDTO.getEApprovalBusiness(); - String businessCode = approvalBusinessResultDTO.getBusinessCode(); - BusinessCommissionDTO businessCommissionDTO = BusinessCommissionDTO.builder().tradeType(eApprovalBusiness.getValue()) - .tradeCode(businessCode).pkCountry(selfServiceLog.getPkCountry()) - .pkCreator(userId).build(); - cuMemberTradeService.businessCommissionReject(businessCommissionDTO); - //更新状态 - return updateApprovalStatus(approvalBusinessResultDTO, userId); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean domicileChangeRejectById(DomicileChangeVO domicileChangeVO, Long pkMember) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); - updateWrapper.set("approve_status", EApproveRechargeStatus.REJECT.getValue()); - updateWrapper.set("approve_time", new Date()); - updateWrapper.set("REJECT_MSG", domicileChangeVO.getRejectMsg()); - updateWrapper.eq("PK_ID", domicileChangeVO.getPkId()); - //更新状态 - update(updateWrapper); - CuSelfServiceLog selfServiceLog = baseMapper.selectById(domicileChangeVO.getPkId()); - //扣费横冲 - BusinessCommissionDTO businessCommissionDTO = BusinessCommissionDTO.builder().tradeType(selfServiceLog.getEditType()) - .tradeCode(selfServiceLog.getBusinessNo()).pkCountry(selfServiceLog.getPkCountry()) - .pkCreator(pkMember).build(); - Boolean result = cuMemberTradeService.businessCommissionReject(businessCommissionDTO); - // MQ户籍变更操作日志 - packageDomicileOperationLog(selfServiceLog, selfServiceLog.getBusinessNo(), "驳回", pkMember, true); - return result; - } - - /** - * 更新审核状态 - * - * @param approvalBusinessResultDTO 审核参数 - * @param pkModified 修改人ID - * @return Integer - */ - public Integer updateApprovalStatus(ApprovalBusinessResultDTO approvalBusinessResultDTO, Long pkModified) { - DomicileChangeVO domicileChange = DomicileChangeVO.builder().businessNo(approvalBusinessResultDTO.getBusinessCode()) - .approveStatus(approvalBusinessResultDTO.getApproveOperation() + 1).approveTime(new Date()) - .pkModified(pkModified).build(); - return baseMapper.updateSelfServiceByBusinessNo(domicileChange); - } - @Override public List queryListByOrderId(List orderIdList) { return baseMapper.queryListByOrderId(orderIdList); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index 62c33fa0..3ecdb6f2 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -2735,12 +2735,6 @@ connect by pk_parent = prior pk_id) where pk_id = #{pkMember} - - - - - - - - - - - update cu_self_service_log - - approve_status = #{approveStatus}, - approve_time = #{approveTime}, - pk_modified = #{pkModified}, - modified_time = sysdate - - where BUSINESS_NO = #{businessNo} - - diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java index d946b68d..fa05b7eb 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java @@ -33,8 +33,6 @@ import com.hzs.member.base.dto.UpdateExpireStopDTO; import com.hzs.member.base.dto.ZeroElementRevokeDTO; import com.hzs.member.handlebusiness.ICuHandleBusinessServiceApi; import com.hzs.member.handlebusiness.dto.AnalysisBusinessAppealParam; -import com.hzs.member.self.ICuSelfServiceServiceApi; -import com.hzs.member.self.dto.SelfServiceDataDTO; import com.hzs.report.stat.dto.StatisticalLogDTO; import com.hzs.report.stat.IStatisticalLogServiceApi; import com.hzs.sale.pub.ISaleApprovalServiceApi; @@ -92,8 +90,6 @@ public class SysApprovalBusinessController extends BaseController { @DubboReference ICuAwardsControlServiceApi controlServiceApi; @DubboReference - ICuSelfServiceServiceApi cuSelfServiceServiceApi; - @DubboReference IActivityApprovalServiceApi iActivityApprovalServiceApi; @DubboReference IUpPolicyCurrencyServiceApi upPolicyCurrencyServiceApi; @@ -201,17 +197,6 @@ public class SysApprovalBusinessController extends BaseController { approvalBusinessVO.setBusinessData(JSONUtil.toJsonStr(controlList.getData())); } } - } else if (approvalBusinessExt.getApprovalBusiness() == EApprovalBusiness.DOMICILE_CHANGE.getValue()) { - //自助服务 - SelfServiceDataDTO serviceDataDTO = SelfServiceDataDTO.builder().businessNo(approvalBusinessExt.getBusinessCode()) - .editType(approvalBusinessExt.getApprovalBusiness()) - .pkCountry(SecurityUtils.getPkCountry()).build(); - R serviceData = cuSelfServiceServiceApi.analysisSelfServiceData(serviceDataDTO); - if (serviceData.isSuccess()) { - if (serviceData.getData() != null) { - approvalBusinessVO.setBusinessData(JSONUtil.toJsonStr(serviceData.getData())); - } - } } else if (approvalBusinessExt.getApprovalBusiness() == EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue() || approvalBusinessExt.getApprovalBusiness() == EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue()) { //修改政策币审核列表 diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java index 4075820a..ddce5b59 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java @@ -19,7 +19,6 @@ import com.hzs.member.account.IBusinessCommission; import com.hzs.member.account.IMemberAccountAuditServiceApi; import com.hzs.member.account.dto.BusinessCommissionDTO; import com.hzs.member.handlebusiness.ICuHandleBusinessServiceApi; -import com.hzs.member.self.ICuSelfServiceServiceApi; import com.hzs.report.stat.IStatisticalLogServiceApi; import com.hzs.sale.order.dto.OrderUseBarCodeDTO; import com.hzs.sale.pub.ISaleApprovalServiceApi; @@ -85,8 +84,6 @@ public class ApprovalServiceImpl implements IApprovalService { IApprovalPushInfo iApprovalPushInfo; @DubboReference IStatisticalLogServiceApi statisticalLogServiceApi; - @DubboReference - ICuSelfServiceServiceApi cuSelfServiceServiceApi; @Transactional(rollbackFor = Exception.class) @Override @@ -514,10 +511,7 @@ public class ApprovalServiceImpl implements IApprovalService { * @return R */ private R getMemberBusiness(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - if (approvalBusinessResultDTO.getEApprovalBusiness() == EApprovalBusiness.DOMICILE_CHANGE) { - // 前台自助服务 - return cuSelfServiceServiceApi.onlineApproval(approvalBusinessResultDTO); - } else if (approvalBusinessResultDTO.getEApprovalBusiness() == EApprovalBusiness.BUSINESS_LICENSE || + if (approvalBusinessResultDTO.getEApprovalBusiness() == EApprovalBusiness.BUSINESS_LICENSE || approvalBusinessResultDTO.getEApprovalBusiness() == EApprovalBusiness.BUSINESS_LICENSE_RESETTING) { //营业执照 return iMemberAccountAuditServiceApi.auditProcess(approvalBusinessResultDTO); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java index dbdb2db6..ff483c41 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java @@ -1005,10 +1005,6 @@ public class ConfigMsgConstants { */ public static final String POLICY_CURRENCY_PETITION = "修改政策币发起签呈失败"; - /** - * 自助服务-修改收货地址 -- 自助服务修改收货地址发起签呈失败 - */ - public static final String SELF_MODIFY_ADDRESS = "自助服务修改收货地址发起签呈失败"; /** * 零元撤单扣款失败 -- 零元撤单扣款失败 */ @@ -1167,10 +1163,6 @@ public class ConfigMsgConstants { * 修改安置安置位置已被占用 -- 修改安置安置位置已被占用 */ public static final String MEMBER_PLACE_PARENT_OCCUPY = "修改安置，安置位置已被占用"; - /** - * 请填写驳回信息 -- 请填写驳回信息 - */ - public static final String REJECT_MSG_NOT_NULL = "请填写驳回信息"; /** * 新邮费旧邮费不相同不能变更地址 -- 新邮费大于旧邮费不能变更地址 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java index f5d6da7b..8093c575 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java @@ -123,14 +123,14 @@ public enum EApprovalBusiness { * 真实奖衔控制-修改 */ AWARDS_CONTROL_MODIFY(129, "修改真实奖衔控制", EnumsPrefixConstants.APPROVAL_BUSINESS + "129"), - /** - * 真实奖衔控制-删除 - */ - AWARDS_CONTROL_DELETE(130, "删除真实奖衔控制", EnumsPrefixConstants.APPROVAL_BUSINESS + "130"), /** * 自助服务-修改收货地址 */ SELF_MODIFY_ADDRESS(131, "自助服务修改收货地址", EnumsPrefixConstants.APPROVAL_BUSINESS + "131"), + /** + * 真实奖衔控制-删除 + */ + AWARDS_CONTROL_DELETE(130, "删除真实奖衔控制", EnumsPrefixConstants.APPROVAL_BUSINESS + "130"), /** * 自助服务-户籍变更 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java index e9a2b5fe..0dffb5c1 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESignSource.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 签呈来源 - * @Author: jiang chao - * @Time: 2023/4/10 14:09 - * @Classname: EApprovalSource - * @PackageName: com.hzs.common.core.enums + * 签呈来源 */ @AllArgsConstructor @Getter