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:
shuo.wang
2025-05-13 11:02:19 +08:00
parent 9d16956755
commit d7a7468c89
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java
View File

@@ -10,7 +10,9 @@ public enum JoinModeEnum {
FRANCHISE_DEPARTMENT(1,"加盟部加盟店"), FRANCHISE_DEPARTMENT(1,"加盟部加盟店"),
FRANCHISE_COMPANIES(2,"加盟公司加盟店"), FRANCHISE_COMPANIES(2,"加盟公司加盟店"),
OWN_STORE(3,"加盟公司自有店"), OWN_STORE(3,"加盟公司自有店"),
STRONG_FRANCHISE(4,"强加盟"); STRONG_FRANCHISE(4,"强加盟"),
DIRECT_SALES_TO_JOINING(5,"直营转加盟")
;
private int code; private int code;
private String desc; private String desc;
private JoinModeEnum(int code, String desc) { private JoinModeEnum(int code, String desc) {

17
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
View File

@@ -40,6 +40,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.text.ParseException; import java.text.ParseException;
@@ -317,10 +318,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) { if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) {
dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime())); dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime()));
dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime())); dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime()));
String total = (new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee())) String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee()))
.add(new BigInteger(franchiseFeeDTO.getFirstYearManagementFee())) .add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee()))
.add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee())) .add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee()))
.add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString()); .add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString());
dto.setTotalAmountContributions(total); dto.setTotalAmountContributions(total);
dto.setFranchiseFee(franchiseFeeDTO.getYearFranchiseFee()); dto.setFranchiseFee(franchiseFeeDTO.getYearFranchiseFee());
dto.setLoanMargin(franchiseFeeDTO.getLoanMargin()); dto.setLoanMargin(franchiseFeeDTO.getLoanMargin());
@@ -460,10 +461,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) { if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) {
dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime())); dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime()));
dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime())); dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime()));
String total = (new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee())) String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee()))
.add(new BigInteger(franchiseFeeDTO.getFirstYearManagementFee())) .add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee()))
.add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee())) .add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee()))
.add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString()); .add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString());
dto.setTotalAmountContributions(total); dto.setTotalAmountContributions(total);
dto.setFranchiseFee(franchiseFeeDTO.getYearFranchiseFee()); dto.setFranchiseFee(franchiseFeeDTO.getYearFranchiseFee());
dto.setLoanMargin(franchiseFeeDTO.getLoanMargin()); dto.setLoanMargin(franchiseFeeDTO.getLoanMargin());