From 456e778f1dd7737c776c110fe5f837705036e88e Mon Sep 17 00:00:00 2001 From: wangff Date: Tue, 11 Nov 2025 18:39:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=89=E6=98=8E=E6=B2=BB=E6=96=B0?= =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E6=8E=A8=E9=80=81=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/xgj/PushFranchiseFeeRequest.java | 22 +++++++++++-------- .../service/impl/FranchiseFeeServiceImpl.java | 4 ++-- .../controller/webb/PCTestController.java | 6 ++--- 3 files changed, 18 insertions(+), 14 deletions(-) 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 373356ea5..7e6873ba3 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 @@ -1,9 +1,9 @@ package com.cool.store.request.xgj; import com.cool.store.entity.FranchiseFeeDO; +import com.cool.store.enums.FranchiseBrandEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.util.Date; @@ -52,18 +52,22 @@ public class PushFranchiseFeeRequest { private Integer joinBrand; public PushFranchiseFeeRequest(){} - public PushFranchiseFeeRequest(Long shopId, String partnerName, FranchiseFeeDO franchiseFeeDO){ + public PushFranchiseFeeRequest(Long shopId, String partnerName, FranchiseFeeDO franchiseFeeDO, String brand){ this.setShopId(shopId); this.setPartnerName(partnerName); this.setBillId(franchiseFeeDO.getId().intValue()); - this.setFranchiseFee(convertToBig(franchiseFeeDO.getYearFranchiseFee())); - this.setBond(convertToBig(franchiseFeeDO.getLoanMargin())); - this.setFirstYearManageFee(convertToBig(franchiseFeeDO.getFirstYearManageFee())); - this.setFirstYearFee(convertToBig(franchiseFeeDO.getFirstYearFee())); - this.setDesignFee(convertToBig(franchiseFeeDO.getPerformanceBond())); - // 三明治收银费 - if (StringUtils.isNotBlank(franchiseFeeDO.getCashierFee())) { + if (Integer.valueOf(brand).equals(FranchiseBrandEnum.ZXSMZ.getCode())) { this.setFranchiseFee(convertToBig(franchiseFeeDO.getCashierFee())); + this.setBond(convertToBig(franchiseFeeDO.getLoanMargin())); + this.setFirstYearManageFee(BigDecimal.ZERO); + this.setFirstYearFee(BigDecimal.ZERO); + this.setDesignFee(convertToBig(franchiseFeeDO.getPerformanceBond())); + } else { + this.setFranchiseFee(convertToBig(franchiseFeeDO.getYearFranchiseFee())); + this.setBond(convertToBig(franchiseFeeDO.getLoanMargin())); + this.setFirstYearManageFee(convertToBig(franchiseFeeDO.getFirstYearManageFee())); + this.setFirstYearFee(convertToBig(franchiseFeeDO.getFirstYearFee())); + this.setDesignFee(convertToBig(franchiseFeeDO.getPerformanceBond())); } this.setTotalFee(this.getBond() .add(this.getFranchiseFee()) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index e8d29d236..7501175f8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -93,7 +93,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.PAY_FRANCHISE_FEES); //推送加盟费信息到新管家 - PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO); + PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO, shopInfoDO.getFranchiseBrand()); feeRequest.setJoinBrand(Integer.valueOf(shopInfoDO.getFranchiseBrand())); pushService.pushFranchiseFeeToXGJ(feeRequest); return true; @@ -116,7 +116,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); //推送加盟费信息到新管家 franchiseFeeDO.setCreateTime(franchiseFeeDO1.getCreateTime()); - PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO); + PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO, shopInfoDO.getFranchiseBrand()); feeRequest.setJoinBrand(Integer.valueOf(shopInfoDO.getFranchiseBrand())); pushService.pushFranchiseFeeToXGJ(feeRequest); return true; diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index ce2e5c02e..a71d3fc56 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -390,7 +390,7 @@ public class PCTestController { FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(shopId); ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); - PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO); + PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO, shopInfoDO.getFranchiseBrand()); pushService.pushFranchiseFeeToXGJ(feeRequest); return ResponseResult.success(Boolean.TRUE); } @@ -418,7 +418,7 @@ public class PCTestController { FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(x.getShopId()); ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(x.getShopId()); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); - PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO); + PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO, shopInfoDO.getFranchiseBrand()); pushService.pushFranchiseFeeToXGJ(feeRequest); } catch (Exception e) { log.error("推送数据失败 shopId {},异常信息：{}",x,e.getMessage()); @@ -434,7 +434,7 @@ public class PCTestController { FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(x.getShopId()); ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(x.getShopId()); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); - PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO); + PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO, shopInfoDO.getFranchiseBrand()); pushService.pushFranchiseFeeToXGJ(feeRequest); List franchiseFeePayInfoByShopId = linePayDAO.getFranchiseFeePayInfoByShopId(x.getShopId()); franchiseFeePayInfoByShopId.forEach(y->{