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-06-13 16:17:44 +08:00
parent 31e09c0e3f
commit c8a50f3350
4 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
coolstore-partner-model/src/main/java/com/cool/store/dto/PartnerBankInfoDTO.java Normal file
View File

@@ -0,0 +1,20 @@
package com.cool.store.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author: WangShuo
* @Date: 2025/06/13/15:47
* @Version 1.0
* @注释:
*/
@Data
public class PartnerBankInfoDTO {
@ApiModelProperty("加盟商结算账户")
private String bankCardNo;
@ApiModelProperty("开户行")
private String bank;
@ApiModelProperty("支行")
private String subBank;
}

2
coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
View File

@@ -90,7 +90,7 @@ public class AddSignFranchiseRequest {
@ApiModelProperty("合同金额") @ApiModelProperty("合同金额")
@NotBlank(message = "合同金额不能为空") @NotBlank(message = "合同金额不能为空")
private String contractAmount; private String contractAmount;
@ApiModelProperty("合伙签约人1//废弃") @ApiModelProperty("合伙签约人1")
private String partnershipSignatoryFirst; private String partnershipSignatoryFirst;
@ApiModelProperty("合伙签约人2") @ApiModelProperty("合伙签约人2")
private String partnershipSignatorySecond; private String partnershipSignatorySecond;

12
coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
View File

@@ -1,5 +1,6 @@
package com.cool.store.response; package com.cool.store.response;
import com.cool.store.dto.PartnerBankInfoDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
public class AddSignFranchiseResponse { public class AddSignFranchiseResponse {
@@ -86,7 +88,7 @@ public class AddSignFranchiseResponse {
private String franchiseeType; private String franchiseeType;
@ApiModelProperty("交款人") @ApiModelProperty("交款人")
private String payName; private List<String> payName;
@ApiModelProperty("营业执照名称") @ApiModelProperty("营业执照名称")
private String licenseName; private String licenseName;
@@ -107,12 +109,8 @@ public class AddSignFranchiseResponse {
@ApiModelProperty("加盟商身份证号") @ApiModelProperty("加盟商身份证号")
private String idCardNo; private String idCardNo;
@ApiModelProperty("加盟商结算账户") @ApiModelProperty("加盟商付款资料")
private String bankCardNo; private List<PartnerBankInfoDTO> partnerPayData;
@ApiModelProperty("开户行")
private String bank;
@ApiModelProperty("支行")
private String subBank;
@ApiModelProperty("身份证地址") @ApiModelProperty("身份证地址")
private String idCardAddress; private String idCardAddress;

33
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants; import com.cool.store.constants.CommonConstants;
import com.cool.store.context.LoginUserInfo; import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.*; import com.cool.store.dao.*;
import com.cool.store.dto.PartnerBankInfoDTO;
import com.cool.store.entity.*; import com.cool.store.entity.*;
import com.cool.store.enums.*; import com.cool.store.enums.*;
import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageEnum;
@@ -453,7 +454,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
//线索id //线索id
Long lineId = shopInfoDO.getLineId(); Long lineId = shopInfoDO.getLineId();
//缴款信息 //缴款信息
LinePayDO linePayDO = linePayMapper.getByLineIdAndPayTypeAndShopId(lineId, 1, shopId); List<LinePayDO> linePayList = linePayMapper.getFranchiseFeePayInfoByShopId(shopId);
// //铺位信息 // //铺位信息
// PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(lineId, shopId); // PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(lineId, shopId);
//证照办理 //证照办理
@@ -524,19 +525,25 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setRegionId(shopInfoDO.getRegionId()); addSignFranchiseResponse.setRegionId(shopInfoDO.getRegionId());
addSignFranchiseResponse.setRegionName(regionInfo.getName()); addSignFranchiseResponse.setRegionName(regionInfo.getName());
} }
if(CollectionUtils.isNotEmpty(linePayList)){
if (Objects.nonNull(linePayDO)) { Set<String> payNameSet = new HashSet<>();
addSignFranchiseResponse.setPayName(linePayDO.getPayUserName()); List<Date> payTimeList = new ArrayList<>();
addSignFranchiseResponse.setBankCardNo(linePayDO.getPayAccount()); List<PartnerBankInfoDTO> partnerPayData = new ArrayList<>();
addSignFranchiseResponse.setBank(linePayDO.getBankName()); for (LinePayDO linePayDO : linePayList){
addSignFranchiseResponse.setSubBank(linePayDO.getBranchBankName()); payNameSet.add(linePayDO.getPayUserName());
if (Objects.nonNull(linePayDO.getPayTime())) { payTimeList.add(linePayDO.getPayTime());
addSignFranchiseResponse.setPayDate(linePayDO.getPayTime()); PartnerBankInfoDTO dto = new PartnerBankInfoDTO();
} else { dto.setBankCardNo(linePayDO.getPayAccount());
List<Date> payTimeList = JsonToDate(linePayDO.getCombinedField()); dto.setBank(linePayDO.getBankName());
Collections.sort(payTimeList); dto.setSubBank(linePayDO.getBranchBankName());
addSignFranchiseResponse.setPayDate(payTimeList.get(0)); partnerPayData.add(dto);
} }
addSignFranchiseResponse.setPayName(new ArrayList<>(payNameSet));
addSignFranchiseResponse.setPartnerPayData(partnerPayData);
Date earliestPayTime = payTimeList.stream()
.min(Comparator.naturalOrder())
.orElse(null);
addSignFranchiseResponse.setPayDate(earliestPayTime);
} }
if (Objects.nonNull(licenseTransactDO)) { if (Objects.nonNull(licenseTransactDO)) {
addSignFranchiseResponse.setLicenseName(licenseTransactDO.getBusinessLicense()); addSignFranchiseResponse.setLicenseName(licenseTransactDO.getBusinessLicense());