分销延时发放

cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionDeliverDTO.java

@@ -0,0 +1,78 @@
+
+package com.czg.market.dto;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 分账延时发放表 实体类。
+ *
+ * @author ww
+ * @since 2025-10-30
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class MkDistributionDeliverDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    private Long sourceId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * order订单recharge充值
+     */
+    private String type;
+
+    /**
+     * 创建时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    /**
+     * 应该发放时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime shouldDeliverTime;
+
+    /**
+     * pending待发放 success成功发放 fail发放失败
+     */
+    private String ststua;
+
+    /**
+     * 失败原因
+     */
+    private String msg;
+
+}

cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionDeliver.java

@@ -0,0 +1,85 @@
+package com.czg.market.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * 分账延时发放表 实体类。
+ *
+ * @author ww
+ * @since 2025-10-30
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("mk_distribution_deliver")
+@Accessors(chain = true)
+public class MkDistributionDeliver implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    private Long sourceId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * order订单recharge充值
+     */
+    private String type;
+
+    /**
+     * 创建时间
+     */
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+    /**
+     * 应该发放时间
+     */
+    private LocalDateTime shouldDeliverTime;
+
+    /**
+     * pending待发放 success成功发放 fail发放失败
+     */
+    private String status;
+
+    /**
+     * 失败原因
+     */
+    private String msg;
+
+}

cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionFlow.java

@@ -109,7 +109,7 @@ public class MkDistributionFlow implements Serializable {
     private Long sourceShopUserId;
 
     private String nickName;
-    private Long sourceDistributionUserId;
-    private LocalDateTime deliverTime;
 
+    private BigDecimal commission;
+    private BigDecimal parentCommission;
 }

cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionDeliverService.java

@@ -0,0 +1,14 @@
+package com.czg.market.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.market.entity.MkDistributionDeliver;
+
+/**
+ * 分账延时发放表 服务层。
+ *
+ * @author ww
+ * @since 2025-10-30
+ */
+public interface MkDistributionDeliverService extends IService<MkDistributionDeliver> {
+
+}

cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java

@@ -123,7 +123,7 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>
      * @param userId   用户id
      * @param shopId   店铺id
      */
-    void distribute(Long sourceId, String orderNo, BigDecimal amount, Long userId, Long shopId, String type);
+    void distribute(Long sourceId, String orderNo, BigDecimal amount, Long userId, Long shopId, String type, boolean isTask);
 
     void updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id, Long userId, Long shopId, Integer isOne);