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

处理冲突

Browse Source
This commit is contained in:
shuo.wang
2025-06-04 14:35:28 +08:00
parent e14806db30 747858b9cf
commit 2788afba17
21 changed files with 376 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java
View File

@@ -106,6 +106,7 @@ public class LinePaySubmitRequest {
linePayDO.setPaySerialNumber(request.getPaySerialNumber());
linePayDO.setAmount(request.getAmount());
linePayDO.setPayBusinessType(request.getPayBusinessType());
linePayDO.setXgjClaimStatus(0);
linePayDO.setRemark(request.getRemark());
return linePayDO;
}

26
coolstore-partner-model/src/main/java/com/cool/store/request/xgj/FranchiseFeeCallBackRequest.java Normal file
View File

@@ -0,0 +1,26 @@
package com.cool.store.request.xgj;
import com.cool.store.dto.region.BigRegionDTO;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
* @Author suzhuhong
* @Date 2025/6/4 11:02
* @Version 1.0
*/
@Data
public class FranchiseFeeCallBackRequest {
@NotNull
private Long shopId;
@NotNull
private BigDecimal payableFee;
@NotNull
private BigDecimal remainingFee;
@NotNull
private Integer paymentStatus;
}

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

@@ -0,0 +1,65 @@
package com.cool.store.request.xgj;
import com.cool.store.entity.FranchiseFeeDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2025/6/3 16:52
* @Version 1.0
*/
@Data
public class PushFranchiseFeeRequest {
@ApiModelProperty( "CRM系统门店ID")
private Long shopId;
@ApiModelProperty( "加盟商姓名")
private String partnerName;
@ApiModelProperty( "账单ID")
private Integer billId;
@ApiModelProperty( "加盟费")
private BigDecimal franchiseFee;
@ApiModelProperty( "保证金")
private BigDecimal bond;
@ApiModelProperty( "第一年度管理费")
private BigDecimal firstYearManageFee;
@ApiModelProperty( "第一年度品牌使用费")
private BigDecimal firstYearFee;
@ApiModelProperty( "设计费")
private BigDecimal designFee;
@ApiModelProperty( "应缴费合计金额")
private BigDecimal totalFee;
@ApiModelProperty( "创建时间")
private Date createTime;
public PushFranchiseFeeRequest(){}
public PushFranchiseFeeRequest(Long shopId, String partnerName, FranchiseFeeDO franchiseFeeDO){
this.setShopId(shopId);
this.setPartnerName(partnerName);
this.setBillId(franchiseFeeDO.getId().intValue());
this.setFranchiseFee(new BigDecimal(franchiseFeeDO.getYearFranchiseFee()));
this.setBond(new BigDecimal(franchiseFeeDO.getLoanMargin()));
this.setFirstYearManageFee(new BigDecimal(franchiseFeeDO.getFirstYearManageFee()));
this.setFirstYearFee(new BigDecimal(franchiseFeeDO.getFirstYearFee()));
this.setDesignFee(new BigDecimal(franchiseFeeDO.getPerformanceBond()));
this.setTotalFee(this.getBond()
.add(this.getFirstYearManageFee())
.add(this.getFirstYearFee())
.add(this.getDesignFee()));
this.setCreateTime(franchiseFeeDO.getCreateTime());
}
}

24
coolstore-partner-model/src/main/java/com/cool/store/request/xgj/ReceiptCallBackRequest.java Normal file
View File

@@ -0,0 +1,24 @@
package com.cool.store.request.xgj;
import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @Author suzhuhong
* @Date 2025/6/4 11:01
* @Version 1.0
*/
@Data
public class ReceiptCallBackRequest {
@NotBlank
private String receiptId;
@Max(1)@Min(0)@NotNull
private Integer claimStatus;
}

77
coolstore-partner-model/src/main/java/com/cool/store/request/xgj/ReceiptRequest.java Normal file
View File

@@ -0,0 +1,77 @@
package com.cool.store.request.xgj;
import com.cool.store.entity.FranchiseFeeDO;
import com.cool.store.entity.LinePayDO;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
import javax.validation.constraints.DecimalMin;
import java.math.BigDecimal;
/**
* @Author suzhuhong
* @Date 2025/6/4 9:33
* @Version 1.0
*/
@Data
public class ReceiptRequest {
@ApiModelProperty( "CRM系统门店ID")
private Long shopId;
@ApiModelProperty( "账单ID")
private Integer billId;
@ApiModelProperty( "收款单ID")
private String receiptId;
@ApiModelProperty( "付款人")
private String payer1;
@ApiModelProperty("付款金额")
private BigDecimal paymentAmount;
@ApiModelProperty("交易流水号")
private String transactionNumber;
@ApiModelProperty( "开户行")
private String bankName;
@ApiModelProperty( "开户支行")
private String branchBankName;
@ApiModelProperty( "付款账号")
private String payAccount;
@ApiModelProperty( "付款凭证")
private String payPic;
@ApiModelProperty( "付款方式")
private Integer payWay = 0;
@ApiModelProperty( "认领状态")
private Integer claimStatus = 0;
@ApiModelProperty( "删除标识")
private Integer deleted = 0;
public ReceiptRequest() {
}
public ReceiptRequest(Long shopId, Integer billId, LinePayDO payDO){
this.setShopId(shopId);
this.setBillId(billId);
this.setReceiptId(payDO.getPaymentReceiptCode());
this.setPayer1(payDO.getPayUserName());
this.setPayAccount(payDO.getPayAccount());
this.setTransactionNumber(payDO.getPaySerialNumber());
this.setBankName(payDO.getBankName());
this.setBranchBankName(payDO.getBranchBankName());
this.setPaymentAmount(payDO.getAmount());
this.setPayPic(payDO.getPayPic());
this.setClaimStatus(payDO.getXgjClaimStatus());
this.setDeleted(payDO.getDeleted()?1:0);
}
}

5
coolstore-partner-model/src/main/java/com/cool/store/response/bigdata/ApiResponse.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.response.bigdata;
import com.cool.store.constants.CommonConstants;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.ResponseCodeEnum;
import lombok.Data;
import org.slf4j.MDC;
@@ -29,4 +30,8 @@ public class ApiResponse<T> {
public static<T> ApiResponse<T> success(T data) {
return new ApiResponse(ResponseCodeEnum.SUCCESS.getCode(), "ok", data);
}
public static<T> ApiResponse<T> error(ErrorCodeEnum errorCodeEnum) {
return new ApiResponse(errorCodeEnum.getCode(), errorCodeEnum.getMessage(), null);
}
}