From 1a9138aaa4e6b600969d1db80ef49d7ee189e451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Thu, 4 Dec 2025 10:21:57 +0800
Subject: [PATCH] feat:getCashierFee

---
 .../store/service/impl/SignFranchiseServiceImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 3d568ab62..d03a99c03 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
@@ -340,26 +340,26 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(request.getShopId());
 
         //正新鸡排
-        if (franchiseFeeDO.getYearFranchiseFee()!=null&&request.getContractFranchiseFee()!=null&&!request.getContractFranchiseFee().equals(franchiseFeeDO.getYearFranchiseFee())){
+        if (StringUtils.isNotEmpty(franchiseFeeDO.getYearFranchiseFee())&&request.getContractFranchiseFee()!=null&&!request.getContractFranchiseFee().equals(franchiseFeeDO.getYearFranchiseFee())){
             return Boolean.FALSE;
         }
         //合同设计费
-        if (franchiseFeeDO.getPerformanceBond()!=null&&request.getContractPerformanceBond()!=null&&!request.getContractPerformanceBond().equals(franchiseFeeDO.getPerformanceBond())){
+        if (StringUtils.isNotEmpty(franchiseFeeDO.getPerformanceBond())&&request.getContractPerformanceBond()!=null&&!request.getContractPerformanceBond().equals(franchiseFeeDO.getPerformanceBond())){
             return Boolean.FALSE;
         }
         //品牌使用费
-        if (franchiseFeeDO.getFirstYearFee()!=null&&request.getContractBrandUseFee()!=null&&!request.getContractBrandUseFee().equals(franchiseFeeDO.getFirstYearFee())){
+        if (StringUtils.isNotEmpty(franchiseFeeDO.getFirstYearFee())&&request.getContractBrandUseFee()!=null&&!request.getContractBrandUseFee().equals(franchiseFeeDO.getFirstYearFee())){
             return Boolean.FALSE;
         }
         //合同保证金
-        if (franchiseFeeDO.getLoanMargin()!=null&&request.getContractLoanMargin()!=null&&!request.getContractLoanMargin().equals(franchiseFeeDO.getLoanMargin())){
+        if (StringUtils.isNotEmpty(franchiseFeeDO.getLoanMargin())&&request.getContractLoanMargin()!=null&&!request.getContractLoanMargin().equals(franchiseFeeDO.getLoanMargin())){
             return Boolean.FALSE;
         }
         //合同管理费
-        if (franchiseFeeDO.getFirstYearManageFee()!=null&&request.getContractManageFee()!=null&&!request.getContractManageFee().equals(franchiseFeeDO.getFirstYearManageFee())){
+        if (StringUtils.isNotEmpty(franchiseFeeDO.getFirstYearManageFee())&&request.getContractManageFee()!=null&&!request.getContractManageFee().equals(franchiseFeeDO.getFirstYearManageFee())){
             return Boolean.FALSE;
         }
-        if (franchiseFeeDO.getCashierFee()!=null&&request.getContractSysUserFee()!=null&&!request.getContractSysUserFee().equals(franchiseFeeDO.getCashierFee())){
+        if (StringUtils.isNotEmpty(franchiseFeeDO.getCashierFee())&&request.getContractSysUserFee()!=null&&!request.getContractSysUserFee().equals(franchiseFeeDO.getCashierFee())){
             return Boolean.FALSE;
         }
         return Boolean.TRUE;