suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
wangff
2025-11-11 14:48:25 +08:00
parent 9c627dd2dd
commit 5af9cb3576
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-model/src/main/java/com/cool/store/request/xgj/PushFranchiseFeeRequest.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.request.xgj;
import com.cool.store.entity.FranchiseFeeDO; import com.cool.store.entity.FranchiseFeeDO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@@ -57,7 +58,10 @@ public class PushFranchiseFeeRequest {
this.setFirstYearManageFee(convertToBig(franchiseFeeDO.getFirstYearManageFee())); this.setFirstYearManageFee(convertToBig(franchiseFeeDO.getFirstYearManageFee()));
this.setFirstYearFee(convertToBig(franchiseFeeDO.getFirstYearFee())); this.setFirstYearFee(convertToBig(franchiseFeeDO.getFirstYearFee()));
this.setDesignFee(convertToBig(franchiseFeeDO.getPerformanceBond())); this.setDesignFee(convertToBig(franchiseFeeDO.getPerformanceBond()));
this.setFranchiseFee(convertToBig(franchiseFeeDO.getCashierFee())); // 三明治收银费
if (StringUtils.isNotBlank(franchiseFeeDO.getCashierFee())) {
this.setFranchiseFee(convertToBig(franchiseFeeDO.getCashierFee()));
}
this.setTotalFee(this.getBond() this.setTotalFee(this.getBond()
.add(this.getFranchiseFee()) .add(this.getFranchiseFee())
.add(this.getFirstYearManageFee()) .add(this.getFirstYearManageFee())