加盟费代码改造

coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -59,4 +60,16 @@ public class FranchiseFeeDO {
     @Column(name = "discount_reason")
     private String discountReason;
 
+    @Column(name = "xgj_collection_status")
+    @ApiModelProperty("新管家收款状态 1-部分缴款 2-已完成")
+    private Integer xgjCollectionStatus;
+
+    @Column(name = "xgj_remainder_payable_amount")
+    @ApiModelProperty("新管家剩余应缴金额")
+    private BigDecimal xgjRemainderPayableAmount;
+
+    @Column(name = "xgj_fees_paid")
+    @ApiModelProperty("新管家已缴金额")
+    private BigDecimal xgjFeesPaid;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java

@@ -11,6 +11,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
+
 /**
  * @author wxp
  * @date 2024-03-27 09:25
@@ -87,4 +89,17 @@ public class LinePayDO implements Serializable {
 
     @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
     private String combinedField;
+
+    @Column(name = "xgj_claim_status")
+    @ApiModelProperty("新管家收款单状态0-待认领，1-已认领")
+    private Integer xgjClaimStatus;
+
+    @Column(name = "payment_receipt_code")
+    @ApiModelProperty("付款单编码(系统生成)")
+    private String paymentReceiptCode;
+
+    @Column(name = "pay_serial_number")
+    @ApiModelProperty("交易流水号")
+    private String paySerialNumber;
+
 }

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

@@ -21,7 +21,7 @@ public class LinePaySubmitRequest {
     @ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败")
     private Integer payStatus;
 
-    @ApiModelProperty("支付方式 1微信 2银行转账")
+    @ApiModelProperty("支付方式 1微信 2银行转账,3-线上支付,4-线下支持")
     private Integer payType;
 
     @ApiModelProperty("付款人姓名/加盟商姓名")
@@ -60,4 +60,7 @@ public class LinePaySubmitRequest {
     private BigDecimal amount;
     @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
     private String combinedField;
+
+    @ApiModelProperty("交易流水号")
+    private String paySerialNumber;
 }