Merge branch 'master' into cc_20250106_v2.4

# Conflicts: # coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
2025-01-10 18:35:32 +08:00
parent c738cfebf7 47c8d0d585
commit 81b135bba6
8 changed files with 26 additions and 21 deletions
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
@@ -185,10 +185,9 @@
    select
    shop_id as shopId,
    max(plan_complete_time) as planCompleteTime,
-    count(1) as totalColumn,
-    sum(if(is_terminated = 1, 1, 0)) as completionColumn
-    from xfsg_shop_stage_info where shop_stage = 2
-    and shop_sub_stage != 85
+    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
    <if test="shopIds != null and shopIds.size() > 0">
      and shop_id in
      <foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
--- 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;
+


 }
--- 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
     */
--- 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);
--- 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;
    }
--- 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
@@ -207,13 +207,14 @@ public class PreparationServiceImpl implements PreparationService {
        List<ShopStageInfoDO> shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null);
        if (CollectionUtils.isNotEmpty(shopStageInfo)) {
            Map<Integer, ShopStageInfoDO> 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<ShopSubStageStatusEnum> 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);
--- 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);
@@ -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());
--- 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
+#aliyun.accessKeyId=LTAI5tQ6QBnWaB5LaJYz6zcD
+#aliyun.accessKeySecret=spqsOgtfr54cwK861O3N3fInydTgjA
+aliyun.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn
+aliyun.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa