From ea8fc0db0c1084aca0051d319eae9be9bc26cba9 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 23 Apr 2024 18:11:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=B3=BB=E7=BB=9F=E5=BB=BA=E5=BA=97?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/AuditTypeEnum.java | 28 ++++++++++++++ .../cool/store/entity/ShopAuditInfoDO.java | 12 +++--- .../service/impl/SysStoreAppServiceImpl.java | 38 ++++++++++++++++++- 3 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/AuditTypeEnum.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditTypeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditTypeEnum.java new file mode 100644 index 000000000..35bc54bf0 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/AuditTypeEnum.java @@ -0,0 +1,28 @@ +package com.cool.store.enums; + +public enum AuditTypeEnum { + VISUAL_ACCEPTANCE(0, "视觉验收"), + TRAINING_REGISTRATION_APPROVAL(1, "培训登记审批"), + OPENING_OPERATION_PLAN(2, "开业运营方案"), + LICENSE_APPROVAL(3, "证照审批"), + SYS_BUILD(4, "系统建店"), + + ; + + private Integer code; + + private String name; + + private AuditTypeEnum(Integer code, String name) { + this.code = code; + this.name = name; + } + + public Integer getCode() { + return code; + } + + public String getName() { + return name; + } +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java index 7f7cd093c..53254ae6d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java @@ -19,7 +19,7 @@ public class ShopAuditInfoDO { * 0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批 */ @Column(name = "audit_type") - private Byte auditType; + private Integer auditType; /** * 提交人ID @@ -37,7 +37,7 @@ public class ShopAuditInfoDO { * 结果类型 0通过,1拒绝 */ @Column(name = "result_type") - private Byte resultType; + private Integer resultType; /** * 通过原因 @@ -111,7 +111,7 @@ public class ShopAuditInfoDO { * * @return audit_type - 0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批 */ - public Byte getAuditType() { + public Integer getAuditType() { return auditType; } @@ -120,7 +120,7 @@ public class ShopAuditInfoDO { * * @param auditType 0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批 */ - public void setAuditType(Byte auditType) { + public void setAuditType(Integer auditType) { this.auditType = auditType; } @@ -165,7 +165,7 @@ public class ShopAuditInfoDO { * * @return result_type - 结果类型 0通过,1拒绝 */ - public Byte getResultType() { + public Integer getResultType() { return resultType; } @@ -174,7 +174,7 @@ public class ShopAuditInfoDO { * * @param resultType 结果类型 0通过,1拒绝 */ - public void setResultType(Byte resultType) { + public void setResultType(Integer resultType) { this.resultType = resultType; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index e67bd54df..cc31ef037 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -6,6 +6,7 @@ import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.entity.*; import com.cool.store.enums.AuditEnum; +import com.cool.store.enums.AuditTypeEnum; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.prepare.newStore.BusinessDistrictEnum; @@ -20,6 +21,7 @@ import com.cool.store.request.SysStoreAppRequest; import com.cool.store.response.ResponseResult; import com.cool.store.response.SysStoreAppResponse; import com.cool.store.service.CoolStoreStartFlowService; +import com.cool.store.service.PreparationService; import com.cool.store.service.SysStoreAppService; import com.cool.store.service.UserAuthMappingService; import com.cool.store.utils.poi.constant.Constants; @@ -61,6 +63,12 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer @Resource UserAuthMappingService userAuthMappingService; + @Resource + PreparationService preparationService; + + @Resource + ShopAuditInfoMapper shopAuditInfoMapper; + @Override @Transactional(rollbackFor = Exception.class) public ResponseResult submitSysBuildStore(SysStoreAppRequest request) { @@ -353,7 +361,35 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer @Override public Boolean auditResult(AuditResultRequest request) { + String kdzBusinessId = request.getKdzBusinessId(); + Long shopId = getShopId(kdzBusinessId); + ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); + //1.成功/失败原因 + try { + shopAuditInfoDO.setShopId(shopId); + shopAuditInfoDO.setAuditType(AuditTypeEnum.SYS_BUILD.getCode()); + LoginUserInfo user = CurrentUserHolder.getUser(); + shopAuditInfoDO.setSubmittedUserId(user.getUserId()); + shopAuditInfoDO.setSubmittedUserName(user.getName()); + if (request.getAuditResult() == 0){ + shopAuditInfoDO.setResultType(1); + shopAuditInfoDO.setRejectReason(request.getCause()); + }else if (request.getAuditResult() == 1){ + shopAuditInfoDO.setResultType(0); + shopAuditInfoDO.setPassReason(request.getCause()); + } + shopAuditInfoMapper.insertSelective(shopAuditInfoDO); + }catch (Exception e){ + throw new ServiceException(ErrorCodeEnum.UNKNOWN); + }finally { + //2.校验建店与加盟签约合同是否完成 并初始化后续流程数据 + preparationService.contractAndBuildStoreCompletion(shopId); + } + return true; + } - return null; + private Long getShopId(String kdzBusinessId) { + String shopId = kdzBusinessId.substring(kdzBusinessId.indexOf("_") + 1,kdzBusinessId.lastIndexOf("_")); + return Long.valueOf(shopId); } }