1.提现优化

src/main/java/com/ydtech/modules/admin/model/vo/SysUserAccountVo.java

@@ -96,4 +96,8 @@ public class SysUserAccountVo {
 
     @ApiModelProperty(value = "银行卡")
     private String fromBankCard;
+
+
+    @ApiModelProperty(value = "银行卡Id")
+    private Long fromBankCardId;
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -12,6 +12,7 @@ import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
 import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
 import com.ydtech.modules.admin.service.*;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -134,7 +135,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Override
     @Transactional
     public HttpResult<Object> inert(SysUserAccountVo sysUserAccountVo) {
-        String userId = sysUserAccountVo.getUserId();
+        String userId = BaseController.getUser().getId();
         BigDecimal zero = BigDecimal.ZERO;
         BigDecimal beforeAmount;
         BigDecimal afterAmount;
@@ -143,24 +144,28 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 //       扣减后金额更改
         SysUserAccountHistory sysUserAccountHistory = new SysUserAccountHistory();  // 记录
         sysUserAccountHistory.setDocumentary(1);  // 1提现
-        sysUserAccountHistory.setUserId(sysUserAccountVo.getUserId());
+        sysUserAccountHistory.setUserId(userId);
         SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();//审核记录表
-        sysAmountAuditingEntity.setUserId(sysUserAccountVo.getUserId());
+        sysAmountAuditingEntity.setUserId(userId);
         sysAmountAuditingEntity.setAmount(sysUserAccountVo.getAmount());
         SysAmountAuditingEntity   judge =    sysAmountAuditingService.getByUserId(userId);
         if(ObjectUtils.isNotEmpty(judge)){
             return HttpResult.ok("有未提现审核单据, 请审核完成之后再提现");
         }
-//      获取银行卡
-        HttpResult<SysUserBankCardVO> byUserId = sysUserBankCardService.getByUserId(userId);
-        if(byUserId!=null  && byUserId.getData()!=null  ){
-            SysUserBankCardVO data = byUserId.getData();
-            if(ObjectUtils.isNotEmpty(data)){
-                sysAmountAuditingEntity.setBankNumber( data.getBankNumber());
-                sysUserAccountHistory.setFromBankCard( data.getBankNumber());
+//      通过银行卡id 查询卡包
+        Long fromBankCardId = sysUserAccountVo.getFromBankCardId();
+        if(fromBankCardId!=null){
+            SysUserBankCard byId = sysUserBankCardService.getById(fromBankCardId);
+            String bankUserId = byId.getUserId();
+            if(!userId.equals(bankUserId)){
+                return HttpResult.ok("非本人提现");
             }
-        }
+            byId.setIsDefault(1);
 
+            sysAmountAuditingEntity.setBankNumber( byId.getBankNumber());
+            sysUserAccountHistory.setFromBankCard( byId.getBankNumber());
+            sysUserBankCardService.updateById(byId);
+        }
 
         if (StringUtils.isNotEmpty(userId)) {
             SysUserAccount sysUserAccount = baseMapper.getById(userId);