diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index 6d3dc4ffd..d9e568b21 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -36,6 +36,8 @@ public enum MessageEnum { MESSAGE_18("您有一个门店已缴纳加盟费/保证金，请审核", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerName}\n##### 加盟商手机号码：${partnerMobile}\n"), MESSAGE_19("您有一个门店待提交加盟合同审核，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerName}\n##### 加盟商手机号码：${partnerMobile}\n"), MESSAGE_20("您有一个门店的加盟合同审核未通过，请查收", "##### 门店名称：${storeName}\n##### 加盟商姓名：${partnerName}\n##### 加盟商手机号码：${partnerMobile}\n"), + MESSAGE_21("加盟商已登记一位员工，请及时安排培训", "##### 员工姓名：【${userName}】，员工手机号码：【${mobile}】，登记时间：【${registerTime}】"), + MESSAGE_22("您收到一位员工由您带教，请查收", "##### 员工姓名：【${userName}】，员工手机号码：【${mobile}】，登记时间：【${registerTime}】"), ; private String title; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java index b1be492dd..eb9ebe972 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java @@ -22,6 +22,12 @@ public enum SMSMsgEnum { SELECT_SUCCESS("选铺成功", "", "SMS_465950846"), RENT_CONTRACT_AUDIT_FAIL("租赁合同上传未通过", "", "SMS_465955429"), SHOP_EXPERIENCE("门店体验安排", "", "SMS_465905828"), + SYS_BUILD_STORE_DONE("系统建店已完成","","SMS_465916277"), + LICENSE_SUBMITTED("证照待提交","","SMS_465981218"), + LICENSE_NOT_PASS("证照未通过","","SMS_465971250"), + FRANCHISE_FEE_SUBMITTED("缴纳加盟费待缴纳","","SMS_465921311"), + FRANCHISE_FEE_NOT_PASS("缴纳加盟费缴纳失败","","SMS_465896262"), + ; private String title; diff --git a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml index e71817b3f..0b5d139c4 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml @@ -1,10 +1,44 @@ + + + + id, + shop_id, + business_license, + license_type, + license_legal_person, + credit_code, + credit_url, + license_address, + issueTime, + validity, + id_card_positive_credit_url, + id_card_negative_credit_url, + food_business_license_code, + main_business, + operator, + food_license_legal_person, + business_project, + food_license_address, + food_business_start_time, + food_business_end_time, + food_business_license_url, + remark, + remark_url, + submit_status, + create_time, + update_time, + deleted + update xfsg_license_transact set submit_status = #{entity.submitStatus} where shop_id = #{entity.shopId} + + and deleted = #{entity.deleted} + @@ -26,6 +60,7 @@ LEFT JOIN xfsg_shop_info s ON o.shop_id = s.id LEFT JOIN xfsg_line_info l ON l.id = s.line_id + o.deleted = 0 and s.supervisor_user_id = #{userId} @@ -52,8 +87,9 @@ \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml index e40974621..26d867204 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OpeningOperationPlanMapper.xml @@ -52,10 +52,11 @@ from xfsg_opening_operation_plan op join xfsg_shop_info si on si.id = op.shop_id where 1=1 + AND si.shop_name like concat('%', #{request.shopName}, '%') - + AND op.result_type = #{request.resultType} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java index 21cf6f1c0..f2d968158 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java @@ -67,6 +67,8 @@ public class LicenseTransactDO { private Date createTime; @Column(name = "update_time") private Date updateTime; + @Column(name = "deleted") + private Integer deleted; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java index 4be947a29..dc5a5c897 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java @@ -45,6 +45,9 @@ public class SubmitLicenseResponse { @ApiModelProperty("有效期(如果为空则是长期有效)") private Date validity; + @ApiModelProperty("有效期类型 0：长期有效（不用传validity） 1：效期内") + private Integer validityType; + @ApiModelProperty("法人双手持身份证正面+营业执照") private String idCardAndLicense1; @@ -103,6 +106,7 @@ public class SubmitLicenseResponse { submitLicenseResponse.setIssueTime(DateUtil.parseDate(storeDocument.getStoreBusinessDate())); submitLicenseResponse.setLicenseAddress(storeDocument.getStoreBusinessAdd()); submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); + submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); submitLicenseResponse.setOperator(storeDocument.getStoreDirector()); submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseOperatorName()); submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness()); @@ -131,6 +135,11 @@ public class SubmitLicenseResponse { submitLicenseResponse.setIssueTime(licenseTransactDO.getIssueTime()); submitLicenseResponse.setLicenseAddress(licenseTransactDO.getLicenseAddress()); submitLicenseResponse.setValidity(licenseTransactDO.getValidity()); + if (Objects.nonNull(licenseTransactDO.getValidity())){ + submitLicenseResponse.setValidityType(1); + }else { + submitLicenseResponse.setValidityType(0); + } submitLicenseResponse.setOperator(licenseTransactDO.getOperator()); submitLicenseResponse.setFoodLicenseLegalPerson(licenseTransactDO.getFoodLicenseLegalPerson()); submitLicenseResponse.setMainBusiness(licenseTransactDO.getMainBusiness()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 5247d49d2..6dd09d115 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -217,6 +217,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { licenseTransactDO.setSubmitStatus(2); shopAuditInfoDO.setRejectReason(result); shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_42; + licenseTransactDO.setDeleted(Constants.ONE_INTEGER); } applyLicenseMapper.updateByShopId(licenseTransactDO); //插入操作/意见 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 35b9608dc..729092135 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -149,7 +149,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //线索信息 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); //缴费信息 - FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectOne(FranchiseFeeDO.builder().shopId(shopId).build()); + FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(shopId); //线索id Long lineId = shopInfoDO.getLineId(); //签约信息 @@ -161,7 +161,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //建店数据 SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).lineId(lineId).build()); //证照办理 - LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectOne(LicenseTransactDO.builder().shopId(shopId).build()); + LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId); ThirdDepartmentDO thirdDepartmentDO = new ThirdDepartmentDO(); if (Objects.nonNull(systemBuildingShopDO)){ //三方部门表 @@ -325,7 +325,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //建店数据 SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).lineId(lineId).build()); //证照办理 - LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectOne(LicenseTransactDO.builder().shopId(shopId).build()); + LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId); if (Objects.nonNull(signFranchiseDO)) { addSignFranchiseResponse.setId(signFranchiseDO.getId()); addSignFranchiseResponse.setShopId(signFranchiseDO.getShopId()); 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 8af5e8442..86a5131bf 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 @@ -96,10 +96,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(request.getLineId(), request.getShopId());//查铺位信息确定铺位所在大区、战区、门店所在省市区街道地址 //3.请求鲜丰接口 NewStoreRequest apiRequest = convertToNewStoreRequest(request,lineInfoDO,pointInfoDO,user); - //todo 暂时去掉 -// return coolStoreStartFlowService.newStore(apiRequest,request.getShopId()); - shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_31,null); - return ResponseResult.success(); + return coolStoreStartFlowService.newStore(apiRequest,request.getShopId()); } @Override