From 294b54738563948a6c510185b1be64130d311601 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Fri, 7 Feb 2025 17:41:37 +0800
Subject: [PATCH] =?UTF-8?q?v2.5=E6=8B=86=E5=88=86=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E7=AE=A1=E7=90=86=E8=B4=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/mapper/FranchiseFeeMapper.java |  2 ++
 .../src/main/resources/mapper/FranchiseFeeMapper.xml   |  5 +++++
 .../java/com/cool/store/entity/FranchiseFeeDO.java     |  2 ++
 .../com/cool/store/request/FranchiseFeeRequest.java    |  5 ++++-
 .../com/cool/store/response/FranchiseFeeResponse.java  |  4 +++-
 .../java/com/cool/store/service/DataHandleService.java |  5 +++++
 .../cool/store/service/impl/DataHandleServiceImpl.java | 10 +++++++++-
 .../store/service/impl/FranchiseFeeServiceImpl.java    |  2 +-
 .../cool/store/controller/webb/PCTestController.java   |  4 ++++
 9 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java
index 168ef8396..f682d7e30 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java
@@ -7,4 +7,6 @@ import tk.mybatis.mapper.common.Mapper;
 public interface FranchiseFeeMapper extends Mapper<FranchiseFeeDO> {
     FranchiseFeeDO selectByShopId(@Param("shopId") Long shopId);
 
+    Integer updateDataHandleServiceV25();
+
 }
diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml
index f5df125cd..70631337c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cool.store.mapper.FranchiseFeeMapper">
+    <update id="updateDataHandleServiceV25">
+        update xfsg_franchise_fee
+        set first_year_fee = "7200",
+        first_year_manage_fee = "6000"
+    </update>
 
     <select id="selectByShopId" resultType="com.cool.store.entity.FranchiseFeeDO">
         select *
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java
index 31fe07899..bfb5f9ac6 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java
@@ -33,6 +33,8 @@ public class FranchiseFeeDO {
     private Date firstYearEndTime;
     @Column(name = "first_year_fee")
     private String  firstYearFee;
+    @Column(name = "first_year_manage_fee")
+    private String  firstYearManageFee;
     @Column(name = "second_year_start_time")
     private Date secondYearStartTime;
     @Column(name = "second_year_end_time")
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java
index 2af633294..6e72e5e8c 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java
@@ -23,8 +23,10 @@ public class FranchiseFeeRequest {
     private Date firstYearStartTime;
     @ApiModelProperty("第一年度结束时间")
     private Date firstYearEndTime;
-    @ApiModelProperty("第一年度加盟费")
+    @ApiModelProperty("第一年度品牌使用费")
     private String firstYearFee;
+    @ApiModelProperty("第一年度管理费")
+    private String  firstYearManageFee;
     @ApiModelProperty("第二年度开始时间")
     private Date secondYearStartTime;
     @ApiModelProperty("第二年度结束时间")
@@ -50,6 +52,7 @@ public class FranchiseFeeRequest {
         franchiseFeeDO.setFirstYearStartTime(this.firstYearStartTime);
         franchiseFeeDO.setFirstYearEndTime(this.firstYearEndTime);
         franchiseFeeDO.setFirstYearFee(this.firstYearFee);
+        franchiseFeeDO.setFirstYearManageFee(this.firstYearManageFee);
         franchiseFeeDO.setSecondYearStartTime(this.secondYearStartTime);
         franchiseFeeDO.setSecondYearEndTime(this.secondYearEndTime);
         franchiseFeeDO.setSecondYearFee(this.secondYearFee);
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
index 616d4039c..78e415b38 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
@@ -23,8 +23,10 @@ public class FranchiseFeeResponse {
     private Date firstYearStartTime;
     @ApiModelProperty("第一年度结束时间")
     private Date firstYearEndTime;
-    @ApiModelProperty("第一年度加盟费")
+    @ApiModelProperty("第一年度品牌使用费")
     private String firstYearFee;
+    @ApiModelProperty("第一年度管理费")
+    private String  firstYearManageFee;
     @ApiModelProperty("第二年度开始时间")
     private Date secondYearStartTime;
     @ApiModelProperty("第二年度结束时间")
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandleService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandleService.java
index f40d79de5..e1b61573d 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandleService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandleService.java
@@ -15,6 +15,11 @@ public interface DataHandleService {
      */
     Boolean dataHandleService(Long shopId);
 
+    /**
+     * v2.5  数据处理
 
+     * @return
+     */
+    Integer dataHandleServiceV25();
 
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandleServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandleServiceImpl.java
index 731237efc..9ecc03b46 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandleServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandleServiceImpl.java
@@ -9,6 +9,7 @@ import com.cool.store.entity.ShopStageInfoDO;
 import com.cool.store.enums.point.ShopStageEnum;
 import com.cool.store.enums.point.ShopSubStageEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
+import com.cool.store.mapper.FranchiseFeeMapper;
 import com.cool.store.service.DataHandleService;
 import com.cool.store.utils.poi.DateUtils;
 import org.apache.commons.collections4.CollectionUtils;
@@ -34,7 +35,8 @@ public class DataHandleServiceImpl implements DataHandleService {
     ShopInfoDAO shopInfoDAO;
     @Resource
     ShopStageInfoDAO shopStageInfoDAO;
-
+    @Resource
+    FranchiseFeeMapper franchiseFeeMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -76,6 +78,12 @@ public class DataHandleServiceImpl implements DataHandleService {
         return Boolean.TRUE;
     }
 
+    @Override
+    public Integer dataHandleServiceV25() {
+        return franchiseFeeMapper.updateDataHandleServiceV25();
+
+    }
+
 
     public void licenseHandle(ShopStageInfoDO shopStageInfoDO){
         if (Objects.isNull(shopStageInfoDO)){
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 ca66971ca..af71c8f0d 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
@@ -97,7 +97,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
                 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(linePayDO.getLineId());
                 linePayResult.setPartnerName(lineInfoDO.getUsername());
             }
-            linePayResult.setAmount(new BigInteger(result.getPerformanceBond()).add(new BigInteger(result.getFirstYearFee()))
+            linePayResult.setAmount(new BigInteger(result.getPerformanceBond()).add(new BigInteger(result.getFirstYearFee())).add(new BigInteger(result.getFirstYearManageFee()))
                     .add(new BigInteger(result.getYearFranchiseFee())).add(new BigInteger(result.getLoanMargin())).toString());
             if (Objects.nonNull(result.getAuditId())) {
                 ShopAuditInfoDO shopAuditInfoDO = shopAuditInfoMapper.selectByPrimaryKey(result.getAuditId());
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
index 878d5557f..57cc64f6f 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
@@ -95,6 +95,10 @@ public class PCTestController {
         return ResponseResult.success(dataHandleService.dataHandleService(shopId));
     }
 
+    @GetMapping("/dataHandleServiceV25")
+    public ResponseResult<Integer> dataHandleServiceV25(){
+        return ResponseResult.success(dataHandleService.dataHandleServiceV25());
+    }
 
     @GetMapping("/licenseSync")
     public ResponseResult<Boolean> licenseSync(){