From d7a7468c89cd3ee8ee03518d8dfbfde15da8ee93 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Tue, 13 May 2025 11:02:19 +0800
Subject: [PATCH] fix

---
 .../java/com/cool/store/enums/JoinModeEnum.java |  4 +++-
 .../service/impl/ExportRealizeServiceImpl.java  | 17 +++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java
index 60b668860..ded308ffa 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java
@@ -10,7 +10,9 @@ public enum JoinModeEnum {
     FRANCHISE_DEPARTMENT(1,"加盟部加盟店"),
     FRANCHISE_COMPANIES(2,"加盟公司加盟店"),
     OWN_STORE(3,"加盟公司自有店"),
-    STRONG_FRANCHISE(4,"强加盟");
+    STRONG_FRANCHISE(4,"强加盟"),
+    DIRECT_SALES_TO_JOINING(5,"直营转加盟")
+    ;
     private int code;
     private String desc;
     private JoinModeEnum(int code, String desc) {
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
index 781bbbc06..48fc90d0f 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
@@ -40,6 +40,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.text.MessageFormat;
 import java.text.ParseException;
@@ -317,10 +318,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
                 if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) {
                     dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime()));
                     dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime()));
-                    String total = (new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee()))
-                            .add(new BigInteger(franchiseFeeDTO.getFirstYearManagementFee()))
-                            .add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee()))
-                            .add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString());
+                    String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee()))
+                            .add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee()))
+                            .add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee()))
+                            .add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString());
                     dto.setTotalAmountContributions(total);
                     dto.setFranchiseFee(franchiseFeeDTO.getYearFranchiseFee());
                     dto.setLoanMargin(franchiseFeeDTO.getLoanMargin());
@@ -460,10 +461,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
                 if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) {
                     dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime()));
                     dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime()));
-                    String total = (new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee()))
-                            .add(new BigInteger(franchiseFeeDTO.getFirstYearManagementFee()))
-                            .add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee()))
-                            .add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString());
+                    String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee()))
+                            .add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee()))
+                            .add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee()))
+                            .add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString());
                     dto.setTotalAmountContributions(total);
                     dto.setFranchiseFee(franchiseFeeDTO.getYearFranchiseFee());
                     dto.setLoanMargin(franchiseFeeDTO.getLoanMargin());