From 5af9cb35765bfa0b307fb6669a9d7d1eee7f1bb4 Mon Sep 17 00:00:00 2001 From: wangff Date: Tue, 11 Nov 2025 14:48:25 +0800 Subject: [PATCH] fix --- .../com/cool/store/request/xgj/PushFranchiseFeeRequest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java index ec16f374c..8b0cd7738 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java @@ -3,6 +3,7 @@ package com.cool.store.request.xgj; import com.cool.store.entity.FranchiseFeeDO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.util.Date; @@ -57,7 +58,10 @@ public class PushFranchiseFeeRequest { this.setFirstYearManageFee(convertToBig(franchiseFeeDO.getFirstYearManageFee())); this.setFirstYearFee(convertToBig(franchiseFeeDO.getFirstYearFee())); this.setDesignFee(convertToBig(franchiseFeeDO.getPerformanceBond())); - this.setFranchiseFee(convertToBig(franchiseFeeDO.getCashierFee())); + // 三明治收银费 + if (StringUtils.isNotBlank(franchiseFeeDO.getCashierFee())) { + this.setFranchiseFee(convertToBig(franchiseFeeDO.getCashierFee())); + } this.setTotalFee(this.getBond() .add(this.getFranchiseFee()) .add(this.getFirstYearManageFee())