From d19ace01b0bf1e71c78b014f055c0d3140aa1a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=9D=B0?= <122581919@qq.com> Date: Mon, 4 Mar 2024 07:12:06 +0000 Subject: [PATCH 01/30] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..fda606505 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# custom_xfsg + From 53f921fe017ef5a657ce09dfc5bb4bde0d9ec077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 28 May 2024 10:51:06 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/JoinIntentionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 86413dff1..f318b25ce 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -65,7 +65,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); log.info("lineInfoDO : {}", JSONObject.toJSONString(lineInfoDO)); if (!Objects.isNull(lineInfoDO) && (WorkflowSubStageStatusEnum.INTENT_5.getCode().equals(lineInfoDO.getWorkflowSubStageStatus())|| - WorkflowSubStageEnum.INTEND.getCode() Date: Tue, 28 May 2024 11:32:20 +0800 Subject: [PATCH 03/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-ab.properties | 14 +--------- .../main/resources/application-hd.properties | 28 ++++++------------- .../resources/application-local.properties | 3 +- .../resources/application-online.properties | 20 +++---------- .../resources/application-test.properties | 14 +--------- 5 files changed, 15 insertions(+), 64 deletions(-) diff --git a/coolstore-partner-web/src/main/resources/application-ab.properties b/coolstore-partner-web/src/main/resources/application-ab.properties index 483541223..3afaec71e 100644 --- a/coolstore-partner-web/src/main/resources/application-ab.properties +++ b/coolstore-partner-web/src/main/resources/application-ab.properties @@ -5,18 +5,7 @@ default.datasource.username=coolstore default.datasource.password=CSCErYcXniNYm7bT #redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 #pagehelper pagehelper.helper-dialect=mysql @@ -50,8 +39,7 @@ oss.bucket=cool-store-hsay oss.file.dir=partner/171cddee76471740/ oss.excelFile.dir=lineExcel/ -#企业corpId -corp.id=171cddee76471740 + #cdn地址 cdn.url=https://testhsaypic.coolstore.cn diff --git a/coolstore-partner-web/src/main/resources/application-hd.properties b/coolstore-partner-web/src/main/resources/application-hd.properties index 20ec0e174..6f31d0437 100644 --- a/coolstore-partner-web/src/main/resources/application-hd.properties +++ b/coolstore-partner-web/src/main/resources/application-hd.properties @@ -1,22 +1,11 @@ #mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD +default.datasource.url=jdbc:mysql://store-big1.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_9096?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true +default.datasource.username=coolstore +default.datasource.password=CSCErYcXniNYm7bT #redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 +redis.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/0 #pagehelper pagehelper.helper-dialect=mysql @@ -37,9 +26,9 @@ mybatis.configuration.map-underscore-to-camel-case=true isv.domain=https://hdstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 +rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 +rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig +rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.topic=simple_message #oss配置 @@ -50,8 +39,7 @@ oss.bucket=cool-store-hsay oss.file.dir=partner/171cddee76471740/ oss.excelFile.dir=lineExcel/ -#企业corpId -corp.id=171cddee76471740 + #cdn地址 cdn.url=https://testhsaypic.coolstore.cn diff --git a/coolstore-partner-web/src/main/resources/application-local.properties b/coolstore-partner-web/src/main/resources/application-local.properties index 4b53830a7..6e325df06 100644 --- a/coolstore-partner-web/src/main/resources/application-local.properties +++ b/coolstore-partner-web/src/main/resources/application-local.properties @@ -39,8 +39,7 @@ oss.bucket=cool-store-hsay oss.file.dir=partner/171cddee76471740/ oss.excelFile.dir=lineExcel/ -#企业corpId -corp.id=171cddee76471740 + #cdn地址 cdn.url=https://testhsaypic.coolstore.cn diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 7a1667c12..99f4aa241 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -5,18 +5,7 @@ default.datasource.username=coolstore default.datasource.password=CSCErYcXniNYm7bT #redis -spring.redis.host=store-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms redis.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/2 #pagehelper pagehelper.helper-dialect=mysql @@ -37,9 +26,9 @@ mybatis.configuration.map-underscore-to-camel-case=true isv.domain=https://abstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 +rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 +rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig +rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.topic=simple_message #oss配置 @@ -50,8 +39,7 @@ oss.bucket=cool-store-hsay oss.file.dir=partner/171cddee76471740/ oss.excelFile.dir=lineExcel/ -#企业corpId -corp.id=171cddee76471740 + #cdn地址 cdn.url=https://testhsaypic.coolstore.cn diff --git a/coolstore-partner-web/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties index c20cf6285..4b652bdef 100644 --- a/coolstore-partner-web/src/main/resources/application-test.properties +++ b/coolstore-partner-web/src/main/resources/application-test.properties @@ -5,18 +5,7 @@ default.datasource.username=coolstore default.datasource.password=CSCErYcXniNYm7bT #redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 #pagehelper pagehelper.helper-dialect=mysql @@ -50,8 +39,7 @@ oss.bucket=cool-store-hsay oss.file.dir=partner/171cddee76471740/ oss.excelFile.dir=lineExcel/ -#企业corpId -corp.id=171cddee76471740 + #cdn地址 cdn.url=https://testhsaypic.coolstore.cn From 5f1b9a77e658489b48ba3424be6011ac86932005 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 13:44:40 +0800 Subject: [PATCH 04/30] api --- .../java/com/cool/store/response/SubmitLicenseResponse.java | 2 +- .../java/com/cool/store/service/impl/KdzApiServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 552346912..75b391a16 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 @@ -27,7 +27,7 @@ public class SubmitLicenseResponse { @ApiModelProperty("营业执照名称") private String licenseName; - @ApiModelProperty("营业执照类型 0:有限责任公司 1:工体工商") + @ApiModelProperty("营业执照类型 0.个体工商户 1.有限责任公司 2.独资企业 3.自然人经营") private Integer licenseType; @ApiModelProperty("营业执照上的法人") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java index 07efdca9b..72e0cf77f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java @@ -64,7 +64,7 @@ public class KdzApiServiceImpl implements KdzApiService { .storeBusinessType(Objects.requireNonNull(LicenseTypeEnum.match(licenseTransactDO.getLicenseType())).getMessage()) .storeBusinessValidPeriod(Objects.isNull(licenseTransactDO.getValidity()) ? "9" : DateUtils.dateTime(licenseTransactDO.getValidity())) .storeCode(storeNum) - .storeDirector(licenseTransactDO.getLicenseLegalPerson()) + .storeDirector(licenseTransactDO.getOperator()) .storeFoodLicense(licenseTransactDO.getFoodBusinessLicenseCode()) .storeFoodLicenseBeginDate(DateUtils.dateTime(licenseTransactDO.getFoodBusinessStartTime())) .storeFoodLicenseEndDate(DateUtils.dateTime(licenseTransactDO.getFoodBusinessEndTime())) From 6112fdaf670ac79aa270743fe4e1f391ec34adfb Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 13:54:25 +0800 Subject: [PATCH 05/30] api --- .../java/com/cool/store/response/SubmitLicenseResponse.java | 2 +- .../com/cool/store/service/impl/ApplyLicenseServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 75b391a16..4e76eba16 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 @@ -181,7 +181,7 @@ public class SubmitLicenseResponse { submitLicenseResponse.setLicenseAddress(storeDocument.getStoreBusinessAdd()); submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); - submitLicenseResponse.setOperator(storeDocument.getStoreDirector()); + submitLicenseResponse.setOperator(storeDocument.getStoreFoodLicenseOperatorName()); submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseOperatorName()); submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness()); submitLicenseResponse.setBusinessProject(storeDocument.getStoreFoodLicenseBusinessScope()); 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 7aa4443d7..1e9c5f849 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 @@ -193,7 +193,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); submitLicenseResponse.setOperator(storeDocument.getStoreDirector()); - submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseOperatorName()); + submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseLegalRepresentative()); submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness()); submitLicenseResponse.setBusinessProject(storeDocument.getStoreFoodLicenseBusinessScope()); submitLicenseResponse.setRemark(storeDocument.getStoreRemark()); From 3cdd6c05bb70408c6aed25b2c9ab6fc3f11fc9e3 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 14:03:39 +0800 Subject: [PATCH 06/30] api --- .../java/com/cool/store/response/SubmitLicenseResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4e76eba16..8f9a730e0 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 @@ -182,7 +182,7 @@ public class SubmitLicenseResponse { submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); submitLicenseResponse.setOperator(storeDocument.getStoreFoodLicenseOperatorName()); - submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseOperatorName()); + submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseLegalRepresentative()); submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness()); submitLicenseResponse.setBusinessProject(storeDocument.getStoreFoodLicenseBusinessScope()); submitLicenseResponse.setRemark(storeDocument.getStoreRemark()); From e6a7537f00b123cdcf9884ed915896e366365a8a Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 14:24:41 +0800 Subject: [PATCH 07/30] api --- .../store/service/impl/KdzApiServiceImpl.java | 2 +- .../controller/webb/KdzApiController.java | 21 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java index 72e0cf77f..07efdca9b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java @@ -64,7 +64,7 @@ public class KdzApiServiceImpl implements KdzApiService { .storeBusinessType(Objects.requireNonNull(LicenseTypeEnum.match(licenseTransactDO.getLicenseType())).getMessage()) .storeBusinessValidPeriod(Objects.isNull(licenseTransactDO.getValidity()) ? "9" : DateUtils.dateTime(licenseTransactDO.getValidity())) .storeCode(storeNum) - .storeDirector(licenseTransactDO.getOperator()) + .storeDirector(licenseTransactDO.getLicenseLegalPerson()) .storeFoodLicense(licenseTransactDO.getFoodBusinessLicenseCode()) .storeFoodLicenseBeginDate(DateUtils.dateTime(licenseTransactDO.getFoodBusinessStartTime())) .storeFoodLicenseEndDate(DateUtils.dateTime(licenseTransactDO.getFoodBusinessEndTime())) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java index 157431756..c62459ae0 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.request.AuditResultRequest; import com.cool.store.request.LicenseBizContentRequest; -import com.cool.store.request.SysBuildResultRequest; import com.cool.store.request.XfsgOpenApiRequest; import com.cool.store.response.LicenseApiResponse; import com.cool.store.response.ResponseResult; @@ -33,12 +32,12 @@ public class KdzApiController { public ResponseResult auditResult(@PathVariable(value = "enterprise-id") String eid, @RequestBody XfsgOpenApiRequest request) { log.info("auditResult requestBody :{}", JSONObject.toJSONString(request)); - if(!verifyMD5(request,eid)){ - log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid); + if (!verifyMD5(request, eid)) { + log.error("验签失败,request：{};eid:{}", JSONObject.toJSONString(request), eid); return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); } - if(eid == null || request.getBizContent() == null){ - log.error("参数校验失败,BizContent：{}",JSONObject.toJSONString(request.getBizContent())); + if (eid == null || request.getBizContent() == null) { + log.error("参数校验失败,BizContent：{}", JSONObject.toJSONString(request.getBizContent())); return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class); @@ -50,12 +49,12 @@ public class KdzApiController { public ResponseResult license(@PathVariable(value = "enterprise-id") String eid, @RequestBody XfsgOpenApiRequest request) { log.info("license requestBody :{}", JSONObject.toJSONString(request)); - if(!verifyMD5(request,eid)){ - log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid); + if (!verifyMD5(request, eid)) { + log.error("验签失败,request：{};eid:{}", JSONObject.toJSONString(request), eid); return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); } - if(eid == null || request.getBizContent() == null){ - log.error("参数校验失败,BizContent：{}",JSONObject.toJSONString(request.getBizContent())); + if (eid == null || request.getBizContent() == null) { + log.error("参数校验失败,BizContent：{}", JSONObject.toJSONString(request.getBizContent())); return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } LicenseBizContentRequest storeNum = JSONObject.parseObject(request.getBizContent(), LicenseBizContentRequest.class); @@ -63,9 +62,7 @@ public class KdzApiController { } - - - public static boolean verifyMD5(XfsgOpenApiRequest request, String eid){ + public static boolean verifyMD5(XfsgOpenApiRequest request, String eid) { //签名 StringBuffer sb = new StringBuffer(); //用户唯一标识id From 9c8ca199427bf077a2f157d07964668b06103aa3 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 28 May 2024 14:44:48 +0800 Subject: [PATCH 08/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 2 +- .../src/main/resources/logback-spring.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 736c1cae8..0e613a596 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-web -spring.profiles.active=test +spring.profiles.active=@profileActive@ server.port=40000 server.servlet.context-path=/xfsg diff --git a/coolstore-partner-web/src/main/resources/logback-spring.xml b/coolstore-partner-web/src/main/resources/logback-spring.xml index 104360a65..47b448c12 100644 --- a/coolstore-partner-web/src/main/resources/logback-spring.xml +++ b/coolstore-partner-web/src/main/resources/logback-spring.xml @@ -2,11 +2,11 @@ - + - + @@ -43,13 +43,13 @@ - + - + From 619cccd35724947fb784ec99bc189fbf6634c560 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 28 May 2024 14:49:57 +0800 Subject: [PATCH 09/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-web/src/main/resources/logback-spring.xml b/coolstore-partner-web/src/main/resources/logback-spring.xml index 47b448c12..145a5f06c 100644 --- a/coolstore-partner-web/src/main/resources/logback-spring.xml +++ b/coolstore-partner-web/src/main/resources/logback-spring.xml @@ -4,15 +4,15 @@ - + - + - + @@ -49,7 +49,7 @@ - + From 9cc17211bcd7d3f9341a1276ccd0abcd0850a817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 28 May 2024 15:00:34 +0800 Subject: [PATCH 10/30] weixin.appId --- .../src/main/resources/application-hd.properties | 4 ++-- .../src/main/resources/application-online.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-web/src/main/resources/application-hd.properties b/coolstore-partner-web/src/main/resources/application-hd.properties index 6f31d0437..0e670ab7a 100644 --- a/coolstore-partner-web/src/main/resources/application-hd.properties +++ b/coolstore-partner-web/src/main/resources/application-hd.properties @@ -48,8 +48,8 @@ trtc.sdkAppId=1400811820 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 -weixin.appId=wx997f2206e276e513 -weixin.appSecret=2ddea4374abeace05e83c948392c2952 +weixin.appId=wx7b16b308c9127a48 +weixin.appSecret=65217b4fe10d74b5785a5ab9475fcb24 weixin.index.url=pages/index/index signKey=d851f2a9ac90474abecdc2fbb148d4d7 diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 99f4aa241..ab17c427c 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -48,8 +48,8 @@ trtc.sdkAppId=1400811820 trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 -weixin.appId=wx997f2206e276e513 -weixin.appSecret=2ddea4374abeace05e83c948392c2952 +weixin.appId=wx7b16b308c9127a48 +weixin.appSecret=65217b4fe10d74b5785a5ab9475fcb24 weixin.index.url=pages/index/index signKey=d851f2a9ac90474abecdc2fbb148d4d7 From 6041f49efa12a6ce49d2a901f705d185f14c3cb0 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 15:19:01 +0800 Subject: [PATCH 11/30] fix --- .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 2 ++ .../com/cool/store/service/impl/FranchiseFeeServiceImpl.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index d8e5dcc57..8b7a65ec4 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -192,6 +192,8 @@ public enum ErrorCodeEnum { TIME_NULL_FALSE(109013, "有时间为空", null), + UNISSUED_STATEMENT_2(109014, "该门店已发布账单", null), + INSERT_OPENING_OPERATION_PLAN_AUDIT_FALSE(103001,"插入运营方案审核信息失败",null), INSERT_OPENING_OPERATION_PLAN_FALSE(103002,"插入运营方案失败",null), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index 24e7d9a30..20759769f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -59,6 +59,10 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { franchiseFeeDO.setId(request.getId()); franchiseFeeMapper.updateByPrimaryKeySelective(franchiseFeeDO); } else { + FranchiseFeeDO isExist = franchiseFeeMapper.selectByShopId(request.getShopId()); + if (Objects.nonNull(isExist)){ + throw new ServiceException(ErrorCodeEnum.UNISSUED_STATEMENT_2); + } franchiseFeeMapper.insertSelective(franchiseFeeDO); } ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId()); From 67f0a78ed1987ec94fdf1a84b84cdd51beb2fa6d Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 15:41:15 +0800 Subject: [PATCH 12/30] date --- .../java/com/cool/store/response/SubmitLicenseResponse.java | 2 +- .../com/cool/store/service/impl/ApplyLicenseServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8f9a730e0..62b8051a3 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 @@ -179,7 +179,7 @@ public class SubmitLicenseResponse { submitLicenseResponse.setLicenseLegalPerson(storeDocument.getStoreDirector()); submitLicenseResponse.setIssueTime(DateUtil.parseDate(storeDocument.getStoreBusinessDate())); submitLicenseResponse.setLicenseAddress(storeDocument.getStoreBusinessAdd()); - submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); + submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parse(storeDocument.getStoreBusinessValidPeriod(),"yyyy-MM-dd")); submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); submitLicenseResponse.setOperator(storeDocument.getStoreFoodLicenseOperatorName()); submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseLegalRepresentative()); 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 1e9c5f849..ce36a5bd1 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 @@ -190,7 +190,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { submitLicenseResponse.setLicenseLegalPerson(storeDocument.getStoreDirector()); submitLicenseResponse.setIssueTime(DateUtil.parseDate(storeDocument.getStoreBusinessDate())); submitLicenseResponse.setLicenseAddress(storeDocument.getStoreBusinessAdd()); - submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); + submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parse(storeDocument.getStoreBusinessValidPeriod(),"yyyy-MM-dd")); submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); submitLicenseResponse.setOperator(storeDocument.getStoreDirector()); submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseLegalRepresentative()); From 7c09e21081b8146f8f0ddf3e58fe2f3ccc967f62 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 28 May 2024 17:28:49 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=A7=9F=E8=B5=81?= =?UTF-8?q?=E5=90=88=E5=90=8C,=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=80=89?= =?UTF-8?q?=E5=9D=80=E7=BB=8F=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/PointServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 166082a5d..e8bea21db 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -910,7 +910,7 @@ public class PointServiceImpl implements PointService { messageMap.put("lineId", String.valueOf(lineInfo.getId())); messageMap.put("partnerUsername", lineInfo.getUsername()); messageMap.put("submitTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, new Date())); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_15, messageMap); + commonService.sendMessage(Arrays.asList(lineInfo.getDevelopmentManager()), MessageEnum.MESSAGE_15, messageMap); return shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21); } @@ -943,8 +943,12 @@ public class PointServiceImpl implements PointService { if(!ShopStageEnum.SHOP_STAGE_1.getShopStage().equals(shopInfo.getShopStage())){ throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); } - Long auditId = shopAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, AuditTypeEnum.UPLOAD_RENT_CONTRACT)); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + if(!request.getOperateUserId().equals(lineInfo.getDevelopmentManager())){ + throw new ServiceException(ErrorCodeEnum.NO_PERMISSION); + } + Long auditId = shopAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, AuditTypeEnum.UPLOAD_RENT_CONTRACT)); + ShopSubStageStatusEnum subStageStatus = AuditResultTypeEnum.PASS.getCode().equals(request.getResultType()) ? ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23 : ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22; if(AuditResultTypeEnum.REJECT.getCode().equals(request.getResultType())){ commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.RENT_CONTRACT_AUDIT_FAIL, null); @@ -997,7 +1001,7 @@ public class PointServiceImpl implements PointService { messageMap.put("lineId", String.valueOf(lineInfo.getId())); messageMap.put("partnerUsername", lineInfo.getUsername()); messageMap.put("submitTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, new Date())); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_15, messageMap); + commonService.sendMessage(Arrays.asList(lineInfo.getDevelopmentManager()), MessageEnum.MESSAGE_15, messageMap); } return shopRentInfoDAO.updateRentContract(shopRentInfo); } From ba7e5c978d44a90c0c1fce9a69e117000f3d6d5b Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 19:08:35 +0800 Subject: [PATCH 14/30] message --- .../com/cool/store/enums/MessageEnum.java | 23 +++++++++++-------- .../service/impl/ApplyLicenseServiceImpl.java | 1 + .../service/impl/FranchiseFeeServiceImpl.java | 1 + .../impl/LineInterviewServiceImpl.java | 7 ------ .../service/impl/LinePayServiceImpl.java | 1 + .../store/service/impl/PointServiceImpl.java | 1 + .../store/service/impl/ShopServiceImpl.java | 17 ++++++++++---- .../impl/SignFranchiseServiceImpl.java | 1 + 8 files changed, 31 insertions(+), 21 deletions(-) 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 4da5a0baa..c6c7fdbc2 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 @@ -123,11 +123,6 @@ public enum MessageEnum { return "dingtalk://dingtalkclient/action/open_micro_app?appId=" + appId + "&corpId=" + corpId + "&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeDetails×tamp=" + System.currentTimeMillis() + "&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); case MESSAGE_15: - case MESSAGE_16: - case MESSAGE_18: - case MESSAGE_19: - case MESSAGE_20: - case MESSAGE_23: case MESSAGE_10_1: case MESSAGE_31: case MESSAGE_32: @@ -135,9 +130,6 @@ public enum MessageEnum { //跳转我的加盟商的加盟商详情都可以使用这个 return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeDetails×tamp=" + System.currentTimeMillis() + "&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); - case MESSAGE_17: - return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + - URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=license×tamp=" + System.currentTimeMillis() + "&shopId=" + paramMap.get("shopId"), StandardCharsets.UTF_8.name()); case MESSAGE_21: return domainUrl + "/dd-noticemsg?appId="+appId+"&corpId="+corpId+"&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining×tamp="+System.currentTimeMillis()+"&userDetailId="+ paramMap.get("userDetailId"), StandardCharsets.UTF_8.name()); @@ -159,7 +151,20 @@ public enum MessageEnum { case MESSAGE_28: return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=eyeAcceptance×tamp="+System.currentTimeMillis()+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); - + case MESSAGE_16: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=sysStoreSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + case MESSAGE_17: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=licenseSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + case MESSAGE_18: + case MESSAGE_23: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + case MESSAGE_19: + case MESSAGE_20: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=contractSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); default: return ""; } 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 ce36a5bd1..59fc74506 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 @@ -111,6 +111,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { requestMap.put("storeName", shopInfoDO.getShopName()); requestMap.put("partnerName", lineInfoDO.getUsername()); requestMap.put("partnerMobile", lineInfoDO.getMobile()); + requestMap.put("lineId", String.valueOf(lineInfoDO.getId())); log.info("submitLicense SMS requestMap:{}", JSONObject.toJSONString(requestMap)); List sendUsers = new ArrayList<>(); //如果没有督导，则发送给管辖此区域的所有战区经理 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index 20759769f..b698ef104 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -120,6 +120,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { requestMap.put("partnerName", lineInfo.getUsername()); requestMap.put("partnerMobile", lineInfo.getMobile()); requestMap.put("lineId", String.valueOf(lineInfo.getId())); + requestMap.put("shopId", String.valueOf(shopInfoDO.getId())); commonService.sendMessage(Collections.singletonList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_19, requestMap); } else if (Constants.ONE_INTEGER.equals(request.getStatus())) { shopAuditInfoDO.setRejectReason(request.getResult()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java index 49c15cb63..14e1ff89d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java @@ -486,13 +486,6 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt messageMap.put("partnerMobile", lineInfo.getMobile()); messageMap.put("wantShopName", wantShopName); commonService.sendMessage(Arrays.asList(developmentManager), MessageEnum.MESSAGE_14, messageMap); - Map requestMap = new HashMap<>(); - //todo 建店还未开始时 - requestMap.put("storeName","XXX"); - requestMap.put("partnerName",lineInfo.getUsername()); - requestMap.put("partnerMobile",lineInfo.getMobile()); - requestMap.put("lineId",String.valueOf(lineInfo.getId())); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_23,requestMap); } return lineInterviewDAO.updateInterviewInfo(updateInterviewInfo) > 0; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index 4f6042c75..3044faf77 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -103,6 +103,7 @@ public class LinePayServiceImpl implements LinePayService { requestMap.put("partnerName",lineInfo.getUsername()); requestMap.put("partnerMobile",lineInfo.getMobile()); requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("shopId",String.valueOf(shopInfoDO.getId())); commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_18,requestMap); } if (PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index e8bea21db..821d0d6d0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -977,6 +977,7 @@ public class PointServiceImpl implements PointService { requestMap.put("partnerName",lineInfo.getUsername()); requestMap.put("partnerMobile",lineInfo.getMobile()); requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("shopId",String.valueOf(shopId)); if (Objects.nonNull(shopInfo.getShopName())) { requestMap.put("storeName",shopInfo.getShopName()); commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index de121ae07..854d21c64 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -3,6 +3,7 @@ package com.cool.store.service.impl; import com.cool.store.dao.*; import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.MessageEnum; import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.point.*; import com.cool.store.exception.ServiceException; @@ -17,10 +18,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -70,7 +68,16 @@ public class ShopServiceImpl implements ShopService { } shopInfoDAO.batchAddShop(addShopList); List shopIds = addShopList.stream().map(ShopInfoDO::getId).collect(Collectors.toList()); - return shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds); + Integer result = shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds); + Map requestMap = new HashMap<>(); + for (Long shopId : shopIds) { + requestMap.put("partnerName",lineInfo.getUsername()); + requestMap.put("partnerMobile",lineInfo.getMobile()); + requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("shopId",String.valueOf(shopId)); + commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_23,requestMap); + } + return result; } @Override 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 7a27e0f7d..a61bd66b4 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 @@ -105,6 +105,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu requestMap.put("partnerName", lineInfo.getUsername()); requestMap.put("partnerMobile", lineInfo.getMobile()); requestMap.put("lineId", String.valueOf(lineInfo.getId())); + requestMap.put("shopId", String.valueOf(shopInfoDO.getId())); commonService.sendMessage(Collections.singletonList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_20, requestMap); } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) { shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); From 757697e7ff941aa9c0de9d086cc46076944542ef Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 28 May 2024 19:55:26 +0800 Subject: [PATCH 15/30] fix --- .../src/main/resources/application-hd.properties | 6 +++--- .../src/main/resources/application-online.properties | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-web/src/main/resources/application-hd.properties b/coolstore-partner-web/src/main/resources/application-hd.properties index 0e670ab7a..a9a0a38db 100644 --- a/coolstore-partner-web/src/main/resources/application-hd.properties +++ b/coolstore-partner-web/src/main/resources/application-hd.properties @@ -44,9 +44,9 @@ oss.excelFile.dir=lineExcel/ cdn.url=https://testhsaypic.coolstore.cn #TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 +trtc.sdkAppId=1600026212 +trtc.secretKey=e036b654c665f649f053a01ff6f5652a826980027be298d4d49949f6e26434a5 +trtc.video.callback.secretKey=ur4wq2iFbRI03Q35 weixin.appId=wx7b16b308c9127a48 weixin.appSecret=65217b4fe10d74b5785a5ab9475fcb24 diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index ab17c427c..cd04a1069 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -44,9 +44,9 @@ oss.excelFile.dir=lineExcel/ cdn.url=https://testhsaypic.coolstore.cn #TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 +trtc.sdkAppId=1600026212 +trtc.secretKey=e036b654c665f649f053a01ff6f5652a826980027be298d4d49949f6e26434a5 +trtc.video.callback.secretKey=ur4wq2iFbRI03Q35 weixin.appId=wx7b16b308c9127a48 weixin.appSecret=65217b4fe10d74b5785a5ab9475fcb24 From 476d3c12e41aeb2e96a09795e15d581d98474c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 28 May 2024 20:11:52 +0800 Subject: [PATCH 16/30] hd --- .../src/main/resources/application-hd.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/resources/application-hd.properties b/coolstore-partner-web/src/main/resources/application-hd.properties index a9a0a38db..0529f3120 100644 --- a/coolstore-partner-web/src/main/resources/application-hd.properties +++ b/coolstore-partner-web/src/main/resources/application-hd.properties @@ -70,7 +70,7 @@ recommended.channel.id=52400 cool.app.id=78836 coolstore.page.domain=https://store.coolstore.cn -xfsg.url=https://inf.xianfengsg.com/InfService +xfsg.url=https://inf-test.xianfengsg.com/InfService aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa From 7a617b45a5dd45f54e5d054056656f964963f326 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 28 May 2024 20:22:04 +0800 Subject: [PATCH 17/30] =?UTF-8?q?=E5=BA=97=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/TrainingExperienceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 2b8debe39..759989e58 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -119,9 +119,9 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr @Override public LeaseBaseInfoDO getTrainingExperience(Long lineId) { List roleNames = new ArrayList<>(); - //todo 写死 roleNames.add("加盟店店长"); roleNames.add("加盟店储备店长"); + roleNames.add("店长"); LeaseBaseInfoDO leaseBaseInfoDO = trainingExperienceMapper.selectByLineId(lineId); if (Objects.isNull(leaseBaseInfoDO)) { From 989dd892c2f72b97f6656288224133395bfa0c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 28 May 2024 20:23:36 +0800 Subject: [PATCH 18/30] hd --- .../src/main/java/com/cool/store/dao/LineInfoDAO.java | 4 ++-- .../src/main/java/com/cool/store/mapper/LineInfoMapper.java | 2 +- .../src/main/resources/mapper/LineInfoMapper.xml | 6 ++++-- .../java/com/cool/store/service/impl/DeskServiceImpl.java | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index a15b93363..fade44b4f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -108,12 +108,12 @@ public class LineInfoDAO { List lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus); return lineInfo; } - public List listByInterview(String interviewId, Integer interviewType,Integer pendingInterviewStatus, + public List listByInterview(String interviewId, Integer interviewType,List pendingInterviewStatusList, Integer notPassingTheInterview,List subStageStatus) { if (StringUtils.isBlank(interviewId)){ return null; } - List lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,pendingInterviewStatus,notPassingTheInterview,subStageStatus); + List lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,pendingInterviewStatusList,notPassingTheInterview,subStageStatus); return lineInfo; } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java index f83873167..8eeea8f33 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java @@ -35,7 +35,7 @@ public interface LineInfoMapper extends Mapper { */ List listByInterview(@Param("interviewId") String interviewId, @Param("interviewType") Integer interviewType, - @Param("pendingInterviewStatus") Integer pendingInterviewStatus, + @Param("pendingInterviewStatusList") List pendingInterviewStatusList, @Param("notPassingTheInterview") Integer notPassingTheInterview, @Param("codes") List codes); diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 170543761..913cbc22e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -335,8 +335,10 @@ #{code} - - and ((workflow_sub_stage_status = #{pendingInterviewStatus} + + + #{status} + and first_interviewer = #{interviewId} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 56babcf19..17b191d0e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -114,7 +114,7 @@ public class DeskServiceImpl implements DeskService { public PageInfo firstInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) { PageHelper.startPage(pageNum, pageSize); List lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.INTERVIEW.getCode(), - WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode(),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),null); + Arrays.asList(WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode(),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_35.getCode()),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),null); PageInfo page = new PageInfo(lineInfoDOS); Map userPortraitMap = this.getUserPortraitMap(lineInfoDOS); List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); @@ -147,7 +147,7 @@ public class DeskServiceImpl implements DeskService { public PageInfo secondInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) { PageHelper.startPage(pageNum, pageSize); List lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.SECOND_INTERVIEW.getCode(), - WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(), WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode(),null); + Arrays.asList(WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(),WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_110.getCode()), WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode(),null); PageInfo page = new PageInfo(lineInfoDOS); Map userPortraitMap = this.getUserPortraitMap(lineInfoDOS); List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); From 273d71171fc58a4a46c4abedc78d9870a85dc1ba Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 28 May 2024 21:26:32 +0800 Subject: [PATCH 19/30] fix --- .../src/main/resources/mapper/ShopStageInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 66c2cbf29..d65cb27c8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -176,7 +176,7 @@ xfsg_shop_stage_info a inner join xfsg_line_info b on a.line_id = b.id where - a.shop_sub_stage = #{shopSubStage} and a.shop_sub_stage_status = #{shopSubStageStatus} and a.deleted = 0 and b.deleted = 0 and b.investment_manager = #{userId} + a.shop_sub_stage = #{shopSubStage} and a.shop_sub_stage_status = #{shopSubStageStatus} and a.deleted = 0 and b.deleted = 0 and b.development_manager = #{userId} From 1a37bdcc780318813d052df03eed94dba8966dd1 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 29 May 2024 09:35:36 +0800 Subject: [PATCH 20/30] one --- .../src/main/resources/mapper/FranchiseFeeMapper.xml | 2 ++ .../com/cool/store/service/impl/FranchiseFeeServiceImpl.java | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml index 223b49db0..f5df125cd 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml @@ -6,5 +6,7 @@ select * from xfsg_franchise_fee where shop_id = #{shopId} + order by create_time desc + limit 1 \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index b698ef104..4c3299a7c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -73,9 +73,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { @Override public FranchiseFeeResponse getDetail(Long shopId) { - FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO(); - franchiseFeeDO.setShopId(shopId); - FranchiseFeeDO result = franchiseFeeMapper.selectOne(franchiseFeeDO); + FranchiseFeeDO result = franchiseFeeMapper.selectByShopId(shopId); if (Objects.isNull(result)){ return new FranchiseFeeResponse(); } From 863bfe3172912ac9540110e1809d27cedc216776 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 29 May 2024 10:16:59 +0800 Subject: [PATCH 21/30] =?UTF-8?q?=E4=B8=89=E6=96=B9=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E8=A1=A8=E8=BF=87=E6=BB=A4=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ThirdDepartmentMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ThirdDepartmentMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ThirdDepartmentMapper.xml index 71f8d4b3a..32dfd5381 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ThirdDepartmentMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ThirdDepartmentMapper.xml @@ -107,6 +107,7 @@ SELECT FROM third_department_${enterpriseId} WHERE department_name = #{name} + limit 1 \ No newline at end of file From afc850e28f369645482f2894fec7fb45686a9943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 29 May 2024 11:01:03 +0800 Subject: [PATCH 22/30] hd --- .../src/main/resources/mapper/LineInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 913cbc22e..84834535c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -379,7 +379,7 @@ sum( IF ( investment_manager = #{userId} AND workflow_sub_stage = 15, 1, 0 ) ) AS payStageCount, sum( IF ( investment_manager = #{userId} AND workflow_sub_stage = 20, 1, 0 ) ) AS signingCount, sum( IF ( investment_manager = #{userId} AND workflow_sub_stage = 25, 1, 0 ) ) AS storeExperienceCount, - sum( IF ( investment_manager = #{userId} AND workflow_sub_stage = 30, 1, 0 ) ) AS secondInterviewCount + sum( IF ( investment_manager = #{userId} AND workflow_sub_stage = 30 and workflow_stage =1, 1, 0 ) ) AS secondInterviewCount FROM xfsg_line_info where deleted = 0 and line_status = 1 and investment_manager = #{userId} From e9df48b730971ea14d8506b199fd21c1e908750b Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 29 May 2024 15:16:13 +0800 Subject: [PATCH 23/30] =?UTF-8?q?=E5=93=81=E7=89=8C=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E7=BB=8F=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DecorationServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index 9f8f2a12e..355c54c6e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -302,13 +302,15 @@ public class DecorationServiceImpl implements DecorationService { shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_130); //发送给品牌设计经理 EnterpriseUserDO enterpriseUser = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.DESIGN_MANAGER, lineInfo.getWantShopAreaId()); - Map messageMap = new HashMap<>(); - messageMap.put("storeName",shopInfo.getShopName()); - messageMap.put("shopId",String.valueOf(shopId)); - messageMap.put("shopName",shopInfo.getShopName()); - messageMap.put("partnerUsername",lineInfo.getUsername()); - messageMap.put("partnerMobile",lineInfo.getMobile()); - commonService.sendMessage(Arrays.asList(enterpriseUser.getUserId()), MessageEnum.MESSAGE_28, messageMap); + if (Objects.nonNull(enterpriseUser)){ + Map messageMap = new HashMap<>(); + messageMap.put("storeName",shopInfo.getShopName()); + messageMap.put("shopId",String.valueOf(shopId)); + messageMap.put("shopName",shopInfo.getShopName()); + messageMap.put("partnerUsername",lineInfo.getUsername()); + messageMap.put("partnerMobile",lineInfo.getMobile()); + commonService.sendMessage(Arrays.asList(enterpriseUser.getUserId()), MessageEnum.MESSAGE_28, messageMap); + } } ConstructionScheduleDTO withdrawal = constructionScheduleDTO; if (Objects.nonNull(acceptanceInfoDO)) { From 8dbe6b457f8549f6bebc20e53e4077f8bfa5b4a1 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 29 May 2024 15:48:45 +0800 Subject: [PATCH 24/30] =?UTF-8?q?=E9=A6=96=E6=89=B9=E8=AE=A2=E8=B4=A7?= =?UTF-8?q?=E9=87=91=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/enums/SMSMsgEnum.java | 1 + .../service/impl/FirstOrderServiceImp.java | 27 ++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) 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 786b21fa2..93423cb2e 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 @@ -33,6 +33,7 @@ public enum SMSMsgEnum { FRANCHISE_FEE_NOT_PASS("缴纳加盟费缴纳失败", "", "SMS_465896262"), DECORATION_MODEL_PAY("装修款待缴费", "","SMS_465961253"), THREE_ACCEPTANCE_WAIT("三方验收待验收","","SMS_465961257"), + FIRST_ORDER("首批订货金代缴费","","SMS_467585281"), TRAINING_REGISTER_SUCCESS("培训登记中", "", "SMS_466035101"), TRAINING_ASSESSMENT_SUCCESS("员工培训已完成", "", "SMS_465901266"), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java index 2de20dc94..24546ef28 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java @@ -6,12 +6,15 @@ import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.FirstOrderDAO; +import com.cool.store.dao.LineInfoDAO; import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.dto.openPreparation.FirstOrderDTO; import com.cool.store.entity.FirstOrderDO; +import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.entity.ShopStageInfoDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; @@ -29,6 +32,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.lang.reflect.InvocationTargetException; import java.util.Date; +import java.util.HashMap; +import java.util.Map; import java.util.Objects; @@ -46,6 +51,8 @@ public class FirstOrderServiceImp implements FirstOrderService { @Resource private PreparationService preparationService; @Resource + private CommonService commonService; + @Resource private ShopService shopService; @Resource private ShopStageInfoDAO shopStageInfoDAO; @@ -53,6 +60,9 @@ public class FirstOrderServiceImp implements FirstOrderService { private CoolStoreStartFlowService coolStoreStartFlowService; @Resource private EnterpriseUserDAO enterpriseUserDAO; + @Resource + private LineInfoDAO lineInfoDAO; + @Override public Integer saveOrder(FirstOrderRequest request, LoginUserInfo user) { log.info("save order:{}", JSONObject.toJSONString(request)); @@ -84,10 +94,15 @@ public class FirstOrderServiceImp implements FirstOrderService { } shopStageInfoDAO.updateShopStageInfo(order.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152); + //发送消息至加盟商 + ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + Map messageMap =new HashMap<>(); + messageMap.put("totalOrderDeposit",request.getTotalOrderDeposit()); + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.FIRST_ORDER, messageMap); //云立方同步 if (num > 0) { try { - ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); String storeNum = shopInfo.getStoreNum(); Boolean flag = coolStoreStartFlowService.getFirstOrder(storeNum); log.info("saveOrder,flag:{}", flag); @@ -106,6 +121,7 @@ public class FirstOrderServiceImp implements FirstOrderService { } return num; } + @Transactional(rollbackFor = Exception.class) @Override public FirstOrderDTO getOrder(Long shopId) { @@ -116,12 +132,11 @@ public class FirstOrderServiceImp implements FirstOrderService { } FirstOrderDTO order = firstOrderDAO.selectFirstOrderByShopId(shopId); ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15); - if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())) - { + if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())) { String userName = enterpriseUserDAO.getUserName(order.getCreateUserId()); order.setPartnerName(userName); - order.setFirstOrderSubStage( ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); + order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); return order; } if (Objects.nonNull(order)) { @@ -140,9 +155,9 @@ public class FirstOrderServiceImp implements FirstOrderService { //更改子阶段状态 shopStageInfoDAO.updateShopStageInfo(order.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151); - order.setFirstOrderSubStage( ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); + order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); preparationService.whetherToOpenForAcceptance(order.getShopId()); - }else { + } else { order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus()); } } catch (Exception e) { From b55e697534b2118f5df3324424528f939e4b589c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 29 May 2024 16:44:04 +0800 Subject: [PATCH 25/30] online --- .../resources/application-online.properties | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index cd04a1069..2b8839188 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -23,7 +23,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain=https://abstore-isv.coolstore.cn/isv +isv.domain=https://store-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 @@ -56,13 +56,14 @@ signKey=d851f2a9ac90474abecdc2fbb148d4d7 fixMobileOpenid=HSAY4AF322E #xxljob配置 #xxljob配置 -xxl.job.admin.addresses=http://10.7.53.224:10001/xxl-job-admin -xxl.job.executor.appname=${spring.application.name} -xxl.job.executor.ip= -xxl.job.executor.port=40001 -xxl.job.executor.logpath=logs/xxl-job/jobhandler -xxl.job.executor.logretentiondays=3 -xxl.job.accessToken=25365115eed84e9ba5e0040abb255a09 + +xxl.job.admin.addresses = http://10.7.53.217:10001/xxl-job-admin,http://10.6.49.25:10001/xxl-job-admin +xxl.job.executor.appname = ${spring.application.name} +xxl.job.executor.ip = +xxl.job.executor.port = 30201 +xxl.job.executor.logpath = logs/xxl-job/jobhandler +xxl.job.executor.logretentiondays = 30 +xxl.job.accessToken = exhibition.channel.id=52399 recommended.channel.id=52400 From 25c3f09c56adc433562a2286e7e038dbc9f3fb46 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 29 May 2024 17:03:43 +0800 Subject: [PATCH 26/30] getTrainingExperience --- .../impl/TrainingExperienceServiceImpl.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 759989e58..329db143c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -46,10 +46,16 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr @Resource EnterpriseUserRoleMapper enterpriseUserRoleMapper; + @Resource + UserAuthMappingMapper userAuthMappingMapper; + @Resource private CommonService commonService; + @Resource + RegionMapper regionMapper; + @Override @Transactional(rollbackFor = Exception.class) public boolean distribution(TrainingExperienceDistributionRequest request) { @@ -137,10 +143,18 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr } List xfStoreManager = sysRoleMapper.getXFStoreManager(roleNames); List roleIds = xfStoreManager.stream().map(SysRoleDO::getId).collect(Collectors.toList()); + //店长角色的用户id List userIdsByRoleIdList = enterpriseUserRoleMapper.getUserIdsByRoleIdList(roleIds); - List userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByRoleIdList); - String storeManagers = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString(); - leaseBaseInfoDO.setStoreManager(storeManagers); + //当前门店 + RegionDO storeRegion = regionMapper.getRegionByStoreId(leaseBaseInfoDO.getStoreId()); + //权限 + List userIdsByMappingIds = userAuthMappingMapper.getUserIdsByMappingIds(Collections.singletonList(storeRegion.getRegionId())); + //过滤 + userIdsByMappingIds.retainAll(userIdsByRoleIdList); + //用户 + List userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByMappingIds); + String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString(); + leaseBaseInfoDO.setStoreManager(nameList); return leaseBaseInfoDO; } From ce5627aaa058c8c870e70e33926b1d582711ed50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 29 May 2024 17:13:25 +0800 Subject: [PATCH 27/30] online --- .../src/main/resources/application-online.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 2b8839188..800a67327 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -32,10 +32,10 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-in rocketmq.topic=simple_message #oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 +oss.accessKeyId=LTAI5tS2khSZfYrTL5cerHbY +oss.accessKeySecret=YChLLev5KRZmgHCAkU7odkhGWk1aif oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay +oss.bucket=coolstore-storage oss.file.dir=partner/171cddee76471740/ oss.excelFile.dir=lineExcel/ @@ -60,7 +60,7 @@ fixMobileOpenid=HSAY4AF322E xxl.job.admin.addresses = http://10.7.53.217:10001/xxl-job-admin,http://10.6.49.25:10001/xxl-job-admin xxl.job.executor.appname = ${spring.application.name} xxl.job.executor.ip = -xxl.job.executor.port = 30201 +xxl.job.executor.port = 40001 xxl.job.executor.logpath = logs/xxl-job/jobhandler xxl.job.executor.logretentiondays = 30 xxl.job.accessToken = From 57b5fa2bc4321dc5d86d9b7bd9831c9ff80ac036 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 29 May 2024 17:17:08 +0800 Subject: [PATCH 28/30] fix --- .../com/cool/store/service/impl/OSSServiceImpl.java | 5 ++++- .../src/main/resources/application-hd.properties | 11 +++++------ .../main/resources/application-online.properties | 13 ++++++------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java index 5c89bb197..e0230e857 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java @@ -1,5 +1,6 @@ package com.cool.store.service.impl; +import cn.hutool.core.date.DateUtil; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.common.utils.BinaryUtil; @@ -9,6 +10,7 @@ import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.response.ResponseResult; import com.cool.store.service.OSSService; +import com.cool.store.utils.poi.DateUtils; import com.cool.store.vo.oss.OssUploadConfigVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -57,7 +59,8 @@ public class OSSServiceImpl implements OSSService { byte[] binaryData = postPolicy.getBytes("utf-8"); String encodedPolicy = BinaryUtil.toBase64String(binaryData); String signature = client.calculatePostSignature(postPolicy); - OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir, host, String.valueOf(expireEndTime / 1000), cdnUrl); + String time = DateUtil.format(new Date(), "yyMM") + "/"; + OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir + time, host, String.valueOf(expireEndTime / 1000), cdnUrl); return result; }catch (Exception e){ log.info("exception", e); diff --git a/coolstore-partner-web/src/main/resources/application-hd.properties b/coolstore-partner-web/src/main/resources/application-hd.properties index 0529f3120..2d49248e5 100644 --- a/coolstore-partner-web/src/main/resources/application-hd.properties +++ b/coolstore-partner-web/src/main/resources/application-hd.properties @@ -32,16 +32,15 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-in rocketmq.topic=simple_message #oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 +oss.accessKeyId=LTAI5tS2khSZfYrTL5cerHbY +oss.accessKeySecret=YChLLev5KRZmgHCAkU7odkhGWk1aif oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir=partner/171cddee76471740/ -oss.excelFile.dir=lineExcel/ +oss.bucket=coolstore-storage +oss.file.dir=eid/9ee7b8b48e2447f9a2075b5a46e94d08/ #cdn地址 -cdn.url=https://testhsaypic.coolstore.cn +cdn.url=https://oss-store.coolcollege.cn #TRTC trtc.sdkAppId=1600026212 diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 2b8839188..56f7254b6 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -32,16 +32,15 @@ rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-in rocketmq.topic=simple_message #oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 +oss.accessKeyId=LTAI5tS2khSZfYrTL5cerHbY +oss.accessKeySecret=YChLLev5KRZmgHCAkU7odkhGWk1aif oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir=partner/171cddee76471740/ -oss.excelFile.dir=lineExcel/ +oss.bucket=coolstore-storage +oss.file.dir=eid/9ee7b8b48e2447f9a2075b5a46e94d08/ #cdn地址 -cdn.url=https://testhsaypic.coolstore.cn +cdn.url=https://oss-store.coolcollege.cn #TRTC trtc.sdkAppId=1600026212 @@ -60,7 +59,7 @@ fixMobileOpenid=HSAY4AF322E xxl.job.admin.addresses = http://10.7.53.217:10001/xxl-job-admin,http://10.6.49.25:10001/xxl-job-admin xxl.job.executor.appname = ${spring.application.name} xxl.job.executor.ip = -xxl.job.executor.port = 30201 +xxl.job.executor.port = 40001 xxl.job.executor.logpath = logs/xxl-job/jobhandler xxl.job.executor.logretentiondays = 30 xxl.job.accessToken = From a5870b76b375e90fa63459db742ed3ed8b7c3c4f Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 29 May 2024 17:41:52 +0800 Subject: [PATCH 29/30] fix --- coolstore-partner-web/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 0e613a596..07a5ba65f 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.application.name=hsay-partner-web +spring.application.name=xianfeng-web spring.profiles.active=@profileActive@ server.port=40000 From 8fa77225a967cc0e188926316e9b45b2ede71255 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 29 May 2024 17:44:15 +0800 Subject: [PATCH 30/30] fix --- .../src/main/resources/application-online.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 56f7254b6..e6d42d645 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -62,7 +62,7 @@ xxl.job.executor.ip = xxl.job.executor.port = 40001 xxl.job.executor.logpath = logs/xxl-job/jobhandler xxl.job.executor.logretentiondays = 30 -xxl.job.accessToken = +xxl.job.accessToken =25365115eed84e9ba5e0040abb255a09 exhibition.channel.id=52399 recommended.channel.id=52400