init

ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserBankCardService.java

@@ -2,6 +2,7 @@ package com.ruoyi.xq.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.xq.domain.UserBankCard;
+import com.ruoyi.xq.dto.app.account.UpdateAliReq;
 
 /**
  * 用户银行卡Service接口
@@ -11,4 +12,7 @@ import com.ruoyi.xq.domain.UserBankCard;
  */
 public interface UserBankCardService extends IService<UserBankCard> {
 
+    void updateAli(UpdateAliReq req);
+
+    UserBankCard getByUserId(Long userId);
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserWithdrawService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.xq.domain.UserWithdraw;
 import com.ruoyi.xq.dto.admin.withdraw.UserWithdrawAdminVo;
+import com.ruoyi.xq.dto.app.account.WithdrawReq;
 import com.ruoyi.xq.dto.app.withdraw.WithdrawListAppVo;
 import com.ruoyi.xq.dto.app.withdraw.WithdrawListPageQuery;
 
@@ -16,7 +17,7 @@ import com.ruoyi.xq.dto.app.withdraw.WithdrawListPageQuery;
  */
 public interface UserWithdrawService extends IService<UserWithdraw> {
 
-    void saveWithdraw(Long userId, Long withdrawSettingId);
+    void saveWithdraw(WithdrawReq req);
 
     Page<WithdrawListAppVo> pageApp(PageQuery pageQuery, WithdrawListPageQuery query);
 

ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserBankCardServiceImpl.java

@@ -1,10 +1,18 @@
 package com.ruoyi.xq.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.xq.domain.UserBankCard;
+import com.ruoyi.xq.dto.app.account.UpdateAliReq;
+import com.ruoyi.xq.dto.common.user.MinUser;
+import com.ruoyi.xq.lock.LockKey;
 import com.ruoyi.xq.mapper.UserBankCardMapper;
 import com.ruoyi.xq.service.UserBankCardService;
+import com.ruoyi.xq.service.UserService;
 import lombok.RequiredArgsConstructor;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +24,50 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 @Service
 public class UserBankCardServiceImpl extends ServiceImpl<UserBankCardMapper,UserBankCard> implements UserBankCardService {
+    @Autowired
+    private RedissonClient redissonClient;
+    @Autowired
+    private UserService userService;
+    @Override
+    public void updateAli(UpdateAliReq req) {
+        checkData(req.getUserId());
+        this.update(Wrappers.lambdaUpdate(UserBankCard.class)
+                .set(UserBankCard::getAliCard,req.getAliCard())
+                .set(UserBankCard::getAliName, req.getAliName())
+                .eq(UserBankCard::getUserId, req.getUserId()));
+    }
 
+    private void checkData(Long userId){
+        UserBankCard one = this.getByUserId(userId);
+        if(one != null){
+            return;
+        }
+        String key = LockKey.getUserBankCard(userId);
+        RLock lock = redissonClient.getLock(key);
+        try {
+            lock.lock();
+            one = this.getByUserId(userId);
+            if(one != null){
+                return;
+            }
+            MinUser minUser = userService.getMinUserById(userId);
+            UserBankCard card = new UserBankCard();
+            card.setUserId(userId);
+            card.setUsercode(minUser.getUsercode());
+            this.save(card);
+        }finally {
+            try {
+                lock.unlock();
+            }catch (Exception e){
+                //
+            }
+        }
+    }
+
+
+
+    @Override
+    public UserBankCard getByUserId(Long userId){
+        return this.getOne(Wrappers.lambdaQuery(UserBankCard.class).eq(UserBankCard::getUserId, userId).last("limit 1"));
+    }
 }

ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserWithdrawServiceImpl.java

@@ -7,20 +7,20 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.xq.domain.*;
 import com.ruoyi.xq.dto.admin.withdraw.UserWithdrawAdminVo;
+import com.ruoyi.xq.dto.app.account.WithdrawReq;
 import com.ruoyi.xq.dto.app.withdraw.WithdrawListAppVo;
 import com.ruoyi.xq.dto.app.withdraw.WithdrawListPageQuery;
+import com.ruoyi.xq.enums.account.WithdrawTypeEnum;
 import com.ruoyi.xq.enums.common.AuditEnum;
 import com.ruoyi.xq.enums.common.OrderTypeEnum;
 import com.ruoyi.xq.enums.common.TraceIdEnum;
 import com.ruoyi.xq.manager.OrderNoUtil;
 import com.ruoyi.xq.manager.TraceIdManager;
 import com.ruoyi.xq.mapper.UserWithdrawMapper;
-import com.ruoyi.xq.service.UserExtendService;
-import com.ruoyi.xq.service.UserService;
-import com.ruoyi.xq.service.UserWithdrawService;
-import com.ruoyi.xq.service.WithdrawSettingService;
+import com.ruoyi.xq.service.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,17 +45,30 @@ public class UserWithdrawServiceImpl extends ServiceImpl<UserWithdrawMapper,User
     private UserExtendService userExtendService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private UserBankCardService userBankCardService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveWithdraw(Long userId, Long withdrawSettingId) {
-        User user = userService.getById(userId);
-        WithdrawSetting withdrawSetting = withdrawSettingService.getById(withdrawSettingId);
+    public void saveWithdraw(WithdrawReq req) {
+        User user = userService.getById(req.getUserId());
+        WithdrawSetting withdrawSetting = withdrawSettingService.getById(req.getId());
         if(withdrawSetting == null){
             throw new ServiceException("提现参数错误");
         }
+        UserBankCard userBankCard = userBankCardService.getByUserId(req.getUserId());
+        if(userBankCard == null){
+            throw new ServiceException("提现失败，请补充账户信息");
+        }
+        if(WithdrawTypeEnum.ALI.getCode().equals(req.getWithdrawType())){
+            if(StringUtils.isEmpty(userBankCard.getAliCard()) || StringUtils.isEmpty(userBankCard.getAliName())){
+                throw new ServiceException("提现失败，请补充支付宝账户信息");
+            }
+        } else {
+            throw new ServiceException("提现失败，请选择提现方式");
+        }
         String traceId = TraceIdManager.gen(TraceIdEnum.WITHDRAW);
-        boolean withdraw = userExtendService.withdraw(userId, withdrawSetting.getMoney(),traceId);
+        boolean withdraw = userExtendService.withdraw(req.getUserId(), withdrawSetting.getMoney(),traceId);
         if(!withdraw){
             throw new ServiceException("提现失败，余额不足");
         }
@@ -65,6 +78,9 @@ public class UserWithdrawServiceImpl extends ServiceImpl<UserWithdrawMapper,User
         userWithdraw.setUsercode(user.getUsercode());
         userWithdraw.setTraceId(traceId);
         userWithdraw.setOrderNo(orderNo);
+        userWithdraw.setWithdrawType(req.getWithdrawType());
+        userWithdraw.setCard(userBankCard.getAliCard());
+        userWithdraw.setName(userBankCard.getAliName());
         userWithdraw.setWithdrawMoney(withdrawSetting.getMoney());
         userWithdraw.setRealWithdrawMoney(withdrawSetting.getMoney());
         userWithdraw.setWithdrawFees(BigDecimal.ZERO);