分销修改

cash-common/cash-common-service/src/main/java/com/czg/account/entity/UserInfo.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -110,4 +111,6 @@ public class UserInfo implements Serializable {
     private String realName;
     private String idCard;
 
+    private BigDecimal distributionAmount;
+
 }

cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java

@@ -6,6 +6,8 @@ import com.czg.account.dto.user.userinfo.UserInfoPwdEditDTO;
 import com.czg.account.entity.UserInfo;
 import com.mybatisflex.core.service.IService;
 
+import java.math.BigDecimal;
+
 /**
  *  服务层。
  *
@@ -22,4 +24,7 @@ public interface UserInfoService extends IService<UserInfo> {
     Boolean updatePwd(long userId, UserInfoPwdEditDTO userInfoPwdEditDTO);
 
     Boolean getCode(Long userId, String type);
+
+    void updateDistributionAmount(long userId, BigDecimal amount);
+
 }

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

@@ -24,8 +24,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @Accessors(chain = true)
 public class MkDistributionWithdrawFlowDTO implements Serializable {
-    @NotNull
-    private Long shopId;
     @NotNull(message = "提现金额不为空")
     @DecimalMin(value = "30", message = "提现金额不能小于30")
     private BigDecimal amount;

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

@@ -36,10 +36,6 @@ public class MkDistributionWithdrawFlow implements Serializable {
     @Id(keyType = KeyType.Auto)
     private Long id;
 
-    /**
-     * 店铺id
-     */
-    private Long shopId;
 
     /**
      * 店铺用户id

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

@@ -111,7 +111,7 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>
      */
     void distribute(Long sourceId, String orderNo, BigDecimal amount, Long userId, Long shopId, String type);
 
-    void updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id);
+    void updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id, Long userId);
 
 
     Boolean withdraw(long userId, MkDistributionWithdrawFlowDTO withdrawFlowDTO);