加盟费改造

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

@@ -37,7 +37,7 @@ public class LinePayDO implements Serializable {
     @ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败")
     private Integer payStatus;
 
-    @ApiModelProperty("支付方式 1微信 2银行转账")
+    @ApiModelProperty("支付方式 1微信 2银行转账 3-线下支付，4-线上支付")
     private Integer payType;
 
     @ApiModelProperty("付款人姓名")
@@ -102,4 +102,7 @@ public class LinePayDO implements Serializable {
     @ApiModelProperty("交易流水号")
     private String paySerialNumber;
 
+    @Column(name = "remark")
+    private String remark;
+
 }

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

@@ -1,17 +1,26 @@
 package com.cool.store.request;
 
+import com.cool.store.entity.LinePayDO;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.tika.utils.DateUtils;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Objects;
+
+import static com.cool.store.enums.WorkflowSubStageStatusEnum.PAY_DEPOSIT_50;
 
 @Data
 public class LinePaySubmitRequest {
 
+    private Long id;
+
     @ApiModelProperty("xfsg_user_info.partner_id")
     private String partnerId;
 
@@ -42,7 +51,6 @@ public class LinePaySubmitRequest {
     @ApiModelProperty("支行名称")
     private String branchBankName;
 
-    //正新缴纳加盟费后续：payTime，payPic废弃使用combinedField
     @ApiModelProperty("缴纳时间")
     private String payTime;
 
@@ -52,15 +60,49 @@ public class LinePaySubmitRequest {
     @ApiModelProperty("承诺书图片")
     private String promisePic;
 
-    @ApiModelProperty("支付类型 0-缴纳意向金 1-缴纳加盟费 2-装修款")
+    @ApiModelProperty("支付类型  1-缴纳加盟费")
     private Integer payBusinessType;
     @ApiModelProperty("铺位id")
     private Long shopId;
     @ApiModelProperty("缴费金额")
     private BigDecimal amount;
+    //废弃
     @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
     private String combinedField;
 
     @ApiModelProperty("交易流水号")
     private String paySerialNumber;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    /**
+     * @Auther: wangshuo
+     * @Date: 2025/5/30
+     * @description:加盟费使用
+     */
+    public static LinePayDO convertFranchiseFee(LinePaySubmitRequest request) {
+        LinePayDO linePayDO = new LinePayDO();
+        linePayDO.setId(request.getId());
+        linePayDO.setPartnerId(request.getPartnerId());
+        linePayDO.setLineId(request.getLineId());
+        linePayDO.setPayStatus(PAY_DEPOSIT_50.getCode());
+        linePayDO.setPayType(request.getPayType());
+        linePayDO.setPayUserName(request.getPayUserName());
+        linePayDO.setPayAccount(request.getPayAccount());
+        linePayDO.setBankCode(request.getBankCode());
+        linePayDO.setBankName(request.getBankName());
+        linePayDO.setBranchBankCode(request.getBranchBankCode());
+        linePayDO.setBranchBankName(request.getBranchBankName());
+        try {
+            linePayDO.setPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(request.getPayTime()));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+        linePayDO.setPayPic(request.getPayPic());
+        linePayDO.setPaySerialNumber(request.getPaySerialNumber());
+        linePayDO.setPayBusinessType(request.getPayBusinessType());
+        linePayDO.setRemark(request.getRemark());
+        return linePayDO;
+    }
 }

coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeePayInfoResponse.java

@@ -0,0 +1,71 @@
+package com.cool.store.response;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/05/30/16:51
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class FranchiseFeePayInfoResponse {
+    private Long id;
+
+    private String partnerName;
+    @ApiModelProperty("xfsg_user_info.partner_id")
+    private String partnerId;
+
+    @ApiModelProperty("line_info.id")
+    private Long lineId;
+
+    @ApiModelProperty("铺位id")
+    private Long shopId;
+
+    @ApiModelProperty("支付方式 1微信 2银行转账,3-线上支付,4-线下支持")
+    private Integer payType;
+
+    @ApiModelProperty("付款人姓名/加盟商姓名")
+    private String payUserName;
+
+    @ApiModelProperty("付款账号")
+    private String payAccount;
+
+    @ApiModelProperty("开户行code")
+    private String bankCode;
+
+    @ApiModelProperty("开户行名称")
+    private String bankName;
+
+    @ApiModelProperty("支行code")
+    private String branchBankCode;
+
+    @ApiModelProperty("支行名称")
+    private String branchBankName;
+
+    @ApiModelProperty("缴纳时间")
+    private String payTime;
+
+    @ApiModelProperty("付款截图")
+    private String payPic;
+
+    @ApiModelProperty("缴费金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty("交易流水号")
+    private String paySerialNumber;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("提交时间")
+    private Date  createTime;
+
+    @ApiModelProperty("认领状态 0-待认领 1-已认领")
+    private Integer xgjClaimStatus;
+}

coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java

@@ -6,12 +6,13 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.*;
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
 public class FranchiseFeeResponse {
     private Long id;
-    @ApiModelProperty("shopId")
+    @ApiModelProperty("shopId门店id")
     private Long shopId;
     @ApiModelProperty("payId")
     private Long payId;
@@ -53,6 +54,17 @@ public class FranchiseFeeResponse {
     @ApiModelProperty("铺位面积")
     private String pointArea;
 
+    @ApiModelProperty("收款状态 0-待缴费 1-部分缴款 2-已完成")
+    private Integer xgjCollectionStatus;
+
+    @ApiModelProperty("剩余待缴金额")
+    private BigDecimal xgjRemainderPayableAmount;
+
+    @ApiModelProperty("新管家已缴金额")
+    private BigDecimal xgjFeesPaid;
+
+
+
     @Data
     public static class LinePay{
         @ApiModelProperty("")
@@ -185,6 +197,9 @@ public class FranchiseFeeResponse {
         franchiseFeeResponse.setUpdateTime(franchiseFeeDO.getUpdateTime());
         franchiseFeeResponse.setFirstYearManageFee(franchiseFeeDO.getFirstYearManageFee());
         franchiseFeeResponse.setDiscountReason(franchiseFeeDO.getDiscountReason());
+        franchiseFeeResponse.setXgjCollectionStatus(franchiseFeeDO.getXgjCollectionStatus());
+        franchiseFeeResponse.setXgjRemainderPayableAmount(franchiseFeeDO.getXgjRemainderPayableAmount());
+        franchiseFeeResponse.setXgjFeesPaid(franchiseFeeDO.getXgjFeesPaid());
         return franchiseFeeResponse;
     }
 }