Merge branch 'cc_20260415_trans'

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

@@ -53,4 +53,10 @@ public class PreAllocationRecordDO implements Serializable {
 
     @Column(name = "update_time")
     private Date updateTime;
+
+    @Column(name = "remark")
+    private String remark;
+
+    @Column(name = "deleted")
+    private Integer deleted;
 }

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

@@ -41,7 +41,7 @@ public class WalletTradeDO {
     private String tradeId;
 
     /**
-     * 交易类型，1转账
+     * 交易类型，1转账 2-提现
      */
     private Integer type;
 

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

@@ -0,0 +1,42 @@
+package com.cool.store.request.store;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * 新增预分账记录请求
+ */
+@Data
+public class PreAllocationAddRequest {
+
+    @NotNull(message = "订单ID不能为空")
+    @ApiModelProperty("订单ID")
+    private Long orderId;
+
+    @NotNull(message = "门店ID不能为空")
+    @ApiModelProperty("门店ID")
+    private Long shopId;
+
+    @NotBlank(message = "费用类型不能为空")
+    @ApiModelProperty("费用类型")
+    private String expenseType;
+
+    @ApiModelProperty("收款公司名称")
+    private String payeeName;
+
+    @ApiModelProperty("收款公司Code")
+    private String payeeCode;
+
+    @NotNull(message = "分账金额不能为空")
+    @DecimalMin(value = "0.01", message = "分账金额必须大于0")
+    @ApiModelProperty("分账金额")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty("分账备注")
+    private String remark;
+}

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

@@ -0,0 +1,36 @@
+package com.cool.store.request.store;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * 编辑预分账记录请求
+ */
+@Data
+public class PreAllocationEditRequest {
+
+    @NotNull(message = "记录ID不能为空")
+    @ApiModelProperty("记录ID")
+    private Long id;
+
+    @ApiModelProperty("费用类型")
+    private String expenseType;
+
+    @ApiModelProperty("收款公司名称")
+    private String payeeName;
+
+    @ApiModelProperty("收款公司Code")
+    private String payeeCode;
+
+    @ApiModelProperty("分账金额")
+    @DecimalMin(value = "0.01", message = "分账金额必须大于0")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty("分账备注")
+    private String remark;
+}

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

@@ -0,0 +1,25 @@
+package com.cool.store.request.store;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Auther zx_szh
+ * @Date 2026/4/15 17:47
+ * @Version 1.0
+ */
+@Data
+public class TransRequest {
+
+    @ApiModelProperty("分账单ID")
+    @NotNull
+    private Long id;
+
+    @ApiModelProperty("备注")
+    @NotBlank(message = "备注不能为空")
+    private String remark;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/order/PreAllocationRecordVO.java

@@ -50,5 +50,7 @@ public class PreAllocationRecordVO {
     @ApiModelProperty("更新时间")
     private Date updateTime;
 
+    @ApiModelProperty("分账备注")
+    private String remark;
 
 }