运营端充值 分账修改

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

@@ -112,4 +112,5 @@ public class MkDistributionFlow implements Serializable {
 
     private BigDecimal commission;
     private BigDecimal parentCommission;
+    private LocalDateTime deliverTime;
 }

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

@@ -114,6 +114,8 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>
      */
     void rechargeCallBack(Long shopId, BigDecimal amount, Long paymentId);
 
+    BigDecimal updateShopInfoAmount(Long shopId, BigDecimal changeAmount, Long sourceId);
+
     /**
      * 发放分销奖励
      *
@@ -123,7 +125,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, boolean isTask);
+    void distribute(Long sourceId, String orderNo, BigDecimal amount, Long userId, Long shopId, String type);
 
     void updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id, Long userId, Long shopId, Integer isOne);
 

cash-common/cash-common-tools/src/main/java/com/czg/constant/TableValueConstant.java

@@ -85,6 +85,7 @@ public interface TableValueConstant {
         enum Status {
             PENDING("pending", "待入账"),
             SUCCESS("success", "已入账"),
+            REFUND("REFUND", "已退款"),
             FAIL("fail", "失败");
             private final String code;
             private final String msg;