From 0b6a54b9142282c32cf0525ac13e2a9db2b67236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 28 Oct 2025 14:03:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/account/entity/UserInfo.java | 3 +++ .../czg/account/service/UserInfoService.java | 5 +++++ .../dto/MkDistributionWithdrawFlowDTO.java | 2 -- .../entity/MkDistributionWithdrawFlow.java | 4 ---- .../service/MkDistributionUserService.java | 2 +- .../service/account/mapper/UserInfoMapper.java | 4 ++++ .../main/resources/mapper/UserInfoMapper.xml | 4 ++++ .../impl/MkDistributionUserServiceImpl.java | 18 ++++++++++-------- 8 files changed, 27 insertions(+), 15 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/UserInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/UserInfo.java index 23e38364..c070cebb 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/UserInfo.java +++ b/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; + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java index e5a344a4..1241e6c1 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java +++ b/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 { Boolean updatePwd(long userId, UserInfoPwdEditDTO userInfoPwdEditDTO); Boolean getCode(Long userId, String type); + + void updateDistributionAmount(long userId, BigDecimal amount); + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionWithdrawFlowDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionWithdrawFlowDTO.java index 625913a3..81668292 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionWithdrawFlowDTO.java +++ b/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; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java index fdeeb60b..5912cf14 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDistributionWithdrawFlow.java +++ b/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 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java index e066efeb..f29a6e75 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java @@ -111,7 +111,7 @@ public interface MkDistributionUserService extends IService */ 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); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java index 4541f244..9d29c998 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java @@ -2,6 +2,9 @@ package com.czg.service.account.mapper; import com.czg.account.entity.UserInfo; import com.mybatisflex.core.BaseMapper; +import org.apache.ibatis.annotations.Update; + +import java.math.BigDecimal; /** * 映射层。 @@ -11,4 +14,5 @@ import com.mybatisflex.core.BaseMapper; */ public interface UserInfoMapper extends BaseMapper { + boolean updateAmount(long userId, BigDecimal amount); } diff --git a/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml b/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml index bc5b78ae..06b522ad 100644 --- a/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml @@ -4,4 +4,8 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + update tb_user_info set distribution_amount = distribution_amount + #{amount} where id = #{id} + and distribution_amount + #{amount} >= 0 + diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index b7bb61e0..7eb9f931 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -481,8 +481,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl