From 006aab62124a399160befae8382b22f1d50176e6 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 4 Mar 2025 16:44:30 +0800 Subject: [PATCH] fix --- .../service/impl/SignFranchiseServiceImpl.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) 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 78083677c..7a1f38bc3 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 @@ -287,17 +287,15 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu addSignFranchiseResponse.setResign(signFranchiseDO.getResign()); addSignFranchiseResponse.setMobile(signFranchiseDO.getMobile()); addSignFranchiseResponse.setContractCode(signFranchiseDO.getContractCode()); - if (StringUtils.isBlank(signFranchiseDO.getContractAmount())) { - 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.setContractAmount(total.toString()); - } else { - addSignFranchiseResponse.setContractAmount(signFranchiseDO.getContractAmount()); - } + addSignFranchiseResponse.setContractAmount(signFranchiseDO.getContractAmount()); + } else { + 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.setContractAmount(total.toString()); addSignFranchiseResponse.setMobile(lineInfoDO.getMobile()); } addSignFranchiseResponse.setStoreName(shopInfoDO.getShopName());