From 7e14212fe7d74cb46c0a7bc8902601935904b3ce Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 3 Mar 2025 19:30:28 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/response/AddSignFranchiseResponse.java | 2 ++ .../cool/store/service/impl/SignFranchiseServiceImpl.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java index ed262347b..d60ba3aeb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java @@ -164,5 +164,7 @@ public class AddSignFranchiseResponse { private String contractCode; @ApiModelProperty("合同金额") private String contractAmount; + @ApiModelProperty("加盟费缴费总金额") + private String totalAmount; } 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 2369f0991..8c0fab01f 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 @@ -33,6 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -350,6 +351,12 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setThirdYearFee(franchiseFeeDO.getThirdYearFee()); addSignFranchiseResponse.setPerformanceBond(franchiseFeeDO.getPerformanceBond()); addSignFranchiseResponse.setBigPerformanceBond(Convert.digitToChinese(Integer.valueOf(franchiseFeeDO.getPerformanceBond()))); + BigDecimal total = new BigDecimal(franchiseFeeDO.getYearFranchiseFee()) + .add(new BigDecimal(franchiseFeeDO.getLoanMargin())) + .add(new BigDecimal(franchiseFeeDO.getFirstYearFee())) + .add(new BigDecimal(franchiseFeeDO.getFirstYearManageFee())) + .add(new BigDecimal(franchiseFeeDO.getPerformanceBond())); + addSignFranchiseResponse.setTotalAmount(total.toString()); } return addSignFranchiseResponse; }