From fae4d72e3b4c64900eeacfc888ab6346b66c5e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 7 Jan 2025 14:40:56 +0800 Subject: [PATCH 1/4] feat:V2.3.1 --- .../src/main/java/com/cool/store/dto/InvoicingDTO.java | 4 ++++ .../main/java/com/cool/store/entity/InvoicingDO.java | 7 +++++++ .../com/cool/store/service/impl/AliyunServiceImpl.java | 10 ++-------- .../cool/store/service/impl/InvoicingServiceImpl.java | 2 -- .../store/service/impl/PreparationServiceImpl.java | 3 ++- .../store/service/impl/SignFranchiseServiceImpl.java | 2 +- .../src/main/resources/application.properties | 8 ++++---- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/InvoicingDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/InvoicingDTO.java index 5454fc2ba..740269692 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/InvoicingDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/InvoicingDTO.java @@ -108,6 +108,10 @@ public class InvoicingDTO { @ApiModelProperty("设计服务费税") private BigDecimal designServiceFeeTax; + private BigDecimal actualPaymentAmount; + + private String financialRemarks; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/InvoicingDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/InvoicingDO.java index 6ddfb3189..fadb88f5e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/InvoicingDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/InvoicingDO.java @@ -1,10 +1,13 @@ package com.cool.store.entity; +import lombok.Data; + import java.math.BigDecimal; import java.util.Date; import javax.persistence.*; @Table(name = "xfsg_invoicing") +@Data public class InvoicingDO { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -106,6 +109,10 @@ public class InvoicingDO { @Column(name = "update_user_id") private String updateUserId; + private BigDecimal actualPaymentAmount; + + private String financialRemarks; + /** * @return id */ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java index 4d4c46974..1bd00abc6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java @@ -45,12 +45,6 @@ public class AliyunServiceImpl implements AliyunService { @Value("${aliyun.accessKeySecret:null}") private String accessKeySecret; - @Value("${aliyun.accessKeyId1:null}") - private String accessKeyId1; - - @Value("${aliyun.accessKeySecret1:null}") - private String accessKeySecret1; - // @Value("${aliyun.sms.domain}") private String smsDomain; @@ -217,8 +211,8 @@ public class AliyunServiceImpl implements AliyunService { throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); } com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config() - .setAccessKeyId(accessKeyId1) - .setAccessKeySecret(accessKeySecret1); + .setAccessKeyId(accessKeyId) + .setAccessKeySecret(accessKeySecret); config.endpoint = "ocr-api.cn-hangzhou.aliyuncs.com"; try { com.aliyun.ocr_api20210707.Client client = new com.aliyun.ocr_api20210707.Client(config); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InvoicingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InvoicingServiceImpl.java index fdd275469..95e4da496 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InvoicingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/InvoicingServiceImpl.java @@ -57,8 +57,6 @@ public class InvoicingServiceImpl implements InvoicingService { //新数据待提交时初始化 老数据已数据处理 阶段状态已完成 只做插入操作 无需初始化 if (shopSubStageInfo!=null&&ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ shopStageInfoDAO.updateShopStageInfo(invoicingDTO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_3); - ////如果发票回传完成 开始设计阶段与验收阶段 - preparationService.contractAndBuildStoreCompletion(invoicingDTO.getShopId()); } return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index 2aac00116..46e083375 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -206,13 +206,14 @@ public class PreparationServiceImpl implements PreparationService { List shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null); if (CollectionUtils.isNotEmpty(shopStageInfo)) { Map shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data)); - Boolean contractCompletionFlag = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_3.getShopSubStageStatus().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_8_5.getShopSubStage()).getShopSubStageStatus()); + Boolean contractCompletionFlag = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84.getShopSubStageStatus().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()).getShopSubStageStatus()); //都完成了 初始化后续流程数据 if (contractCompletionFlag) { //初始化后续流程数据s List list = new ArrayList<>(); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40); + list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_150); 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 96a8190b0..28e4f7987 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 @@ -172,7 +172,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu //todo 提交之后先直接到已签约 正常是待审核 shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84); //初始化数据 - shopStageInfoDAO.batchUpdateShopStageStatus(request.getShopId(),Arrays.asList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1)); + preparationService.contractAndBuildStoreCompletion(request.getShopId()); commonService.sendSms(lineInfoDO.getMobile(),SMSMsgEnum.SIGN_CONTRACT); } else { signFranchiseMapper.updateByPrimaryKeySelective(signFranchiseDO); diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index b872997a2..81fd7fbd4 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -58,7 +58,7 @@ wx.pay.apiV3Key=wxpayzhenghu123JKJHkjafWXCertUt1 wx.pay.payNotifyUrl=https://abstore-api.coolstore.cn/zxjp/mini/wechatPay/payNotify wx.pay.backNotifyUrl=https://abstore-api.coolstore.cn/zxjp/mini/wechatPay/refundNotify -aliyun.accessKeyId=LTAI5tQ6QBnWaB5LaJYz6zcD -aliyun.accessKeySecret=spqsOgtfr54cwK861O3N3fInydTgjA -aliyun.accessKeyId1=LTAI5tAVZ3r9UtSpLGcmGoQn -aliyun.accessKeySecret1=WIMjO4BjVg3YAHwmplq86yOyS2HMpa \ No newline at end of file +#aliyun.accessKeyId=LTAI5tQ6QBnWaB5LaJYz6zcD +#aliyun.accessKeySecret=spqsOgtfr54cwK861O3N3fInydTgjA +aliyun.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn +aliyun.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa \ No newline at end of file From 5c68a762178cb4998107915f86a6c7f15acf5c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 7 Jan 2025 14:55:59 +0800 Subject: [PATCH 2/4] feat:bugfix --- .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 28e4f7987..b877b5b9c 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 @@ -293,7 +293,9 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setOpeAddress(licenseTransactDO.getLicenseAddress()); addSignFranchiseResponse.setOperator(licenseTransactDO.getOperator()); addSignFranchiseResponse.setLicenseCode(licenseTransactDO.getCreditCode()); - addSignFranchiseResponse.setType(LicenseTypeEnum.match(licenseTransactDO.getLicenseType()).getMessage()); + if (licenseTransactDO.getLicenseType()!=null){ + addSignFranchiseResponse.setType(LicenseTypeEnum.match(licenseTransactDO.getLicenseType()).getMessage()); + } } if (Objects.nonNull(lineInfoDO)) { addSignFranchiseResponse.setPartnerName(lineInfoDO.getUsername()); From 860906fe3d37d7354d66203004726304e3e7ec19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 7 Jan 2025 15:41:43 +0800 Subject: [PATCH 3/4] feat:bugfix --- .../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 06b406396..06f942a0a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -186,7 +186,7 @@ shop_id as shopId, max(plan_complete_time) as planCompleteTime, count(1) as totalColumn, - sum(if(is_terminated = 1, 1, 0)) as completionColumn + sum(if(is_terminated = 1 and shop_sub_stage!=85, 1, 0)) as completionColumn from xfsg_shop_stage_info where shop_stage = 2 and shop_id in From 5ad1dc3ae1f6578619818c68f6356d71cd7416b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 7 Jan 2025 15:49:18 +0800 Subject: [PATCH 4/4] feat:bugfix --- .../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 06f942a0a..afe35fc0d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -185,7 +185,7 @@ select shop_id as shopId, max(plan_complete_time) as planCompleteTime, - count(1) as totalColumn, + count(1)-1 as totalColumn, sum(if(is_terminated = 1 and shop_sub_stage!=85, 1, 0)) as completionColumn from xfsg_shop_stage_info where shop_stage = 2