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:59:41 +08:00
parent e5acef3899
commit 1eb09a9380
2 changed files with 6 additions and 2 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

@@ -48,6 +48,9 @@ public class PushFranchiseFeeRequest {
@ApiModelProperty( "创建时间") @ApiModelProperty( "创建时间")
private Date createTime; private Date createTime;
@ApiModelProperty("品牌")
private Integer joinBrand;
public PushFranchiseFeeRequest(){} public PushFranchiseFeeRequest(){}
public PushFranchiseFeeRequest(Long shopId, String partnerName, FranchiseFeeDO franchiseFeeDO){ public PushFranchiseFeeRequest(Long shopId, String partnerName, FranchiseFeeDO franchiseFeeDO){
this.setShopId(shopId); this.setShopId(shopId);
@@ -66,8 +69,7 @@ public class PushFranchiseFeeRequest {
.add(this.getFranchiseFee()) .add(this.getFranchiseFee())
.add(this.getFirstYearManageFee()) .add(this.getFirstYearManageFee())
.add(this.getFirstYearFee()) .add(this.getFirstYearFee())
.add(this.getDesignFee()) .add(this.getDesignFee()));
.add(this.getFranchiseFee()));
this.setCreateTime(franchiseFeeDO.getCreateTime()); this.setCreateTime(franchiseFeeDO.getCreateTime());
} }

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
View File

@@ -94,6 +94,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.PAY_FRANCHISE_FEES); 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);
feeRequest.setJoinBrand(Integer.valueOf(shopInfoDO.getFranchiseBrand()));
pushService.pushFranchiseFeeToXGJ(feeRequest); pushService.pushFranchiseFeeToXGJ(feeRequest);
return true; return true;
} }
@@ -116,6 +117,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService {
//推送加盟费信息到新管家 //推送加盟费信息到新管家
franchiseFeeDO.setCreateTime(franchiseFeeDO1.getCreateTime()); franchiseFeeDO.setCreateTime(franchiseFeeDO1.getCreateTime());
PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO); PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO);
feeRequest.setJoinBrand(Integer.valueOf(shopInfoDO.getFranchiseBrand()));
pushService.pushFranchiseFeeToXGJ(feeRequest); pushService.pushFranchiseFeeToXGJ(feeRequest);
return true; return true;
} }