From 71c6446cd33f1c0464e7dbe98063c1fd4e1c35a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 1 Dec 2025 13:56:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=97=A8=E5=BA=97=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SignFranchiseServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 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 38052821d..7ef8ce209 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 @@ -338,23 +338,28 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu private Boolean feeCheck(AddSignFranchiseRequest request){ //查询账单金额 FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(request.getShopId()); - if (!request.getContractFranchiseFee().equals(franchiseFeeDO.getYearFranchiseFee())){ + + //正新鸡排 + if (franchiseFeeDO.getYearFranchiseFee()!=null&&request.getContractFranchiseFee()!=null&&!request.getContractFranchiseFee().equals(franchiseFeeDO.getYearFranchiseFee())){ return Boolean.FALSE; } //合同设计费 - if (!request.getContractPerformanceBond().equals(franchiseFeeDO.getPerformanceBond())){ + if (franchiseFeeDO.getPerformanceBond()!=null&&request.getContractPerformanceBond()!=null&&!request.getContractPerformanceBond().equals(franchiseFeeDO.getPerformanceBond())){ return Boolean.FALSE; } //品牌使用费 - if (!request.getContractBrandUseFee().equals(franchiseFeeDO.getFirstYearFee())){ + if (franchiseFeeDO.getFirstYearFee()!=null&&request.getContractBrandUseFee()!=null&&!request.getContractBrandUseFee().equals(franchiseFeeDO.getFirstYearFee())){ return Boolean.FALSE; } //合同保证金 - if (!request.getContractLoanMargin().equals(franchiseFeeDO.getLoanMargin())){ + if (franchiseFeeDO.getLoanMargin()!=null&&request.getContractLoanMargin()!=null&&!request.getContractLoanMargin().equals(franchiseFeeDO.getLoanMargin())){ return Boolean.FALSE; } //合同管理费 - if (!request.getContractManageFee().equals(franchiseFeeDO.getFirstYearManageFee())){ + if (franchiseFeeDO.getFirstYearManageFee()!=null&&request.getContractManageFee()!=null&&!request.getContractManageFee().equals(franchiseFeeDO.getFirstYearManageFee())){ + return Boolean.FALSE; + } + if (franchiseFeeDO.getCashierFee()!=null&&request.getContractSysUserFee()!=null&&!request.getContractSysUserFee().equals(franchiseFeeDO.getCashierFee())){ return Boolean.FALSE; } return Boolean.TRUE;