Ver Fonte

1.用户提现需求
2.提现审核需求

wuhp há 2 anos atrás
pai
commit
ec935f098e
18 ficheiros alterados com 429 adições e 10 exclusões
  1. 32 0
      src/main/java/com/ydtech/modules/admin/controller/SysAmountAuditingController.java
  2. 14 4
      src/main/java/com/ydtech/modules/admin/controller/SysUserAccountController.java
  3. 3 0
      src/main/java/com/ydtech/modules/admin/controller/SysUserBankController.java
  4. 11 0
      src/main/java/com/ydtech/modules/admin/dao/SysAmountAuditingMapper.java
  5. 1 0
      src/main/java/com/ydtech/modules/admin/dao/SysUserAccountMapper.java
  6. 4 0
      src/main/java/com/ydtech/modules/admin/dao/SysUserBankCardMapper.java
  7. 55 0
      src/main/java/com/ydtech/modules/admin/model/po/SysAmountAuditingEntity.java
  8. 52 0
      src/main/java/com/ydtech/modules/admin/model/vo/SysAmountAuditingVo.java
  9. 11 0
      src/main/java/com/ydtech/modules/admin/model/vo/SysUserAccountVo.java
  10. 11 0
      src/main/java/com/ydtech/modules/admin/service/SysAmountAuditingService.java
  11. 5 0
      src/main/java/com/ydtech/modules/admin/service/SysUserAccountService.java
  12. 2 0
      src/main/java/com/ydtech/modules/admin/service/SysUserBankCardService.java
  13. 68 0
      src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java
  14. 82 6
      src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java
  15. 6 0
      src/main/java/com/ydtech/modules/admin/service/impl/SysUserBankCardServiceImpl.java
  16. 38 0
      src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml
  17. 23 0
      src/main/resources/mapper/modules/admin/SysUserAccountMapper.xml
  18. 11 0
      src/main/resources/mapper/modules/admin/SysUserBankCardMapper.xml

+ 32 - 0
src/main/java/com/ydtech/modules/admin/controller/SysAmountAuditingController.java

@@ -0,0 +1,32 @@
+package com.ydtech.modules.admin.controller;
+
+
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
+import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
+import com.ydtech.modules.admin.service.SysAmountAuditingService;
+import com.ydtech.modules.base.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "账户余额")
+@RequestMapping("/sysAmountAuditing")
+@RestController
+public class SysAmountAuditingController extends BaseController {
+    @Autowired
+    private SysAmountAuditingService sysAmountAuditingService;
+
+
+
+    @PutMapping("AmountReview")
+    @ApiOperation("审核提现")
+    public HttpResult<Object> AmountReview(@RequestBody SysAmountAuditingVo sysUserAccountVo) {
+        sysAmountAuditingService.AmountReview(sysUserAccountVo);
+        return HttpResult.ok("审核成功");
+    }
+}

+ 14 - 4
src/main/java/com/ydtech/modules/admin/controller/SysUserAccountController.java

@@ -1,19 +1,20 @@
 package com.ydtech.modules.admin.controller;
 
 
+import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
+import com.ydtech.modules.admin.model.vo.SysUserAccountHistoryVo;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
 import com.ydtech.modules.admin.service.SysUserAccountService;
 import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.esm.model.vo.EsmInsAttributionTemplateSaveVo;
 import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 
@@ -33,6 +34,15 @@ public class SysUserAccountController extends BaseController {
         return HttpResult.ok("success", result);
     }
 
+    @PostMapping("/insert")
+    @ApiOperation("提交")
+    public HttpResult<Object> submit(@RequestBody SysUserAccountVo sysUserAccountVo) {
+        return sysUserAccountService.inert(sysUserAccountVo);
+    }
+
+
+
+
 
 
 }

+ 3 - 0
src/main/java/com/ydtech/modules/admin/controller/SysUserBankController.java

@@ -62,6 +62,9 @@ public class SysUserBankController extends BaseController {
         bankCardService.uodate(sysUserBankCardVO);
         return HttpResult.ok("修改成功");
     }
+    @GetMapping HttpResult<SysUserBankCardVO> getById (String  userId){
+        return  bankCardService.getByUserId(userId);
+    }
 
 
 }

+ 11 - 0
src/main/java/com/ydtech/modules/admin/dao/SysAmountAuditingMapper.java

@@ -0,0 +1,11 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SysAmountAuditingMapper  extends BaseMapper<SysAmountAuditingEntity> {
+    SysAmountAuditingEntity getByUserId(String userId);
+
+}

+ 1 - 0
src/main/java/com/ydtech/modules/admin/dao/SysUserAccountMapper.java

@@ -16,6 +16,7 @@ public interface SysUserAccountMapper extends BaseMapper<SysUserAccount> {
 
     Page<SysUserAccount> queryPageOrder(SysUserAccountVo sysUserAccountVo,@Param("page") Page page);
 
+    SysUserAccount getById(String userId);
 }
 
 

+ 4 - 0
src/main/java/com/ydtech/modules/admin/dao/SysUserBankCardMapper.java

@@ -1,7 +1,9 @@
 package com.ydtech.modules.admin.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
+import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
 
 /**
 * @author Administrator
@@ -11,6 +13,8 @@ import com.ydtech.modules.admin.model.po.SysUserBankCard;
 */
 public interface SysUserBankCardMapper extends BaseMapper<SysUserBankCard> {
 
+
+    HttpResult<SysUserBankCardVO> getByUserId(String userId);
 }
 
 

+ 55 - 0
src/main/java/com/ydtech/modules/admin/model/po/SysAmountAuditingEntity.java

@@ -0,0 +1,55 @@
+package com.ydtech.modules.admin.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@TableName(value ="sys_amount_auditing")
+@Data
+public class SysAmountAuditingEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Integer id;
+    /**
+     * 用户id
+     */
+    @TableField(value = "user_id")
+    private String userId;
+    /**
+     * 银行卡号
+     */
+    @TableField(value = "bank_number")
+    private String bankNumber;
+
+    /**
+     * 提现金额
+     */
+    @TableField(value = "amount")
+    private BigDecimal amount;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 审核状态
+     */
+    @TableField(value = "auditing_status")
+    private String auditingStatus;
+    /**
+     * 金额类型
+     */
+    @TableField(value = "amount_status")
+    private String amountStatus;
+}

+ 52 - 0
src/main/java/com/ydtech/modules/admin/model/vo/SysAmountAuditingVo.java

@@ -0,0 +1,52 @@
+package com.ydtech.modules.admin.model.vo;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel("查询Vo")
+public class SysAmountAuditingVo {
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @ApiModelProperty(value = "银行卡号")
+    private String bankNumber;
+
+
+    @ApiModelProperty(value = "提现金额")
+    private BigDecimal amount;
+
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+
+    @ApiModelProperty(value = "审核状态")
+    private String auditingStatus;
+
+    @ApiModelProperty(value = "金额类型")
+    private String amountStatus;
+
+    @ApiModelProperty(value = "每页页数")
+    @Min(value = 20, message = "页数最小为20")
+    @Max(value = 100, message = "页数最大为100")
+    private int pageSize;
+
+    @ApiModelProperty(value = "页数")
+    @Min(value = 1, message = "页数最小为1")
+    private int pageNum;
+
+}

+ 11 - 0
src/main/java/com/ydtech/modules/admin/model/vo/SysUserAccountVo.java

@@ -85,4 +85,15 @@ public class SysUserAccountVo {
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")
     private int pageNum;
+
+
+
+    @ApiModelProperty(value = "提现金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "体现类型  1.手续费佣金 2.非跟单佣金 3.推广佣金")
+    private String amountStatus;
+
+    @ApiModelProperty(value = "银行卡")
+    private String fromBankCard;
 }

+ 11 - 0
src/main/java/com/ydtech/modules/admin/service/SysAmountAuditingService.java

@@ -0,0 +1,11 @@
+package com.ydtech.modules.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
+import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
+
+public interface SysAmountAuditingService extends IService<SysAmountAuditingEntity> {
+    void AmountReview(SysAmountAuditingVo sysUserAccountVo);
+
+    SysAmountAuditingEntity getByUserId(String userId);
+}

+ 5 - 0
src/main/java/com/ydtech/modules/admin/service/SysUserAccountService.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -15,4 +16,8 @@ public interface SysUserAccountService extends IService<SysUserAccount> {
     void addOrUpdate(SysUserAccount sysUserAccount);
 
     BasePageResult<SysUserAccount> queryByVo(SysUserAccountVo sysUserAccountVo);
+
+
+    HttpResult<Object> inert(SysUserAccountVo sysUserAccountVo);
+
 }

+ 2 - 0
src/main/java/com/ydtech/modules/admin/service/SysUserBankCardService.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -23,4 +24,5 @@ public interface SysUserBankCardService extends IService<SysUserBankCard> {
 
     void uodate(SysUserBankCardVO sysUserBankCardVO);
 
+    HttpResult<SysUserBankCardVO> getByUserId(String userId);
 }

+ 68 - 0
src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -0,0 +1,68 @@
+package com.ydtech.modules.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.admin.dao.SysAmountAuditingMapper;
+import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
+import com.ydtech.modules.admin.model.po.SysUserAccount;
+import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
+import com.ydtech.modules.admin.service.SysAmountAuditingService;
+import com.ydtech.modules.admin.service.SysUserAccountService;
+import com.ydtech.utils.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+
+@Service
+public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingMapper, SysAmountAuditingEntity> implements SysAmountAuditingService {
+    @Autowired
+    private SysUserAccountService sysUserAccountService;
+
+    @Override
+    @Transactional
+    public void AmountReview(SysAmountAuditingVo sysAmountAuditingVo) {
+
+        SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();
+
+        BigDecimal amount = sysAmountAuditingVo.getAmount();
+        String userId = sysAmountAuditingVo.getUserId();
+        SysUserAccount sysUserAccountEntity = new SysUserAccount();
+//      用户扣减金额
+        if (StringUtils.isNotEmpty(userId)) {
+            sysUserAccountEntity.setUserId(userId);
+            SysUserAccount sysUserAccount = sysUserAccountService.getById(userId);
+            if (ObjectUtils.isNotEmpty(sysUserAccount)) {
+                String amountStatus = sysAmountAuditingVo.getAmountStatus();
+                if (StringUtils.isNotEmpty(amountStatus)) {
+                    if ("1".equals(amountStatus)) {
+                        BigDecimal handlingFee = sysUserAccount.getHandlingFee();
+                        BigDecimal afterAmount = handlingFee.subtract(amount);
+                        sysUserAccountEntity.setHandlingFee(afterAmount);
+                    } else if ("2".equals(amountStatus)) {
+                        BigDecimal documentary = sysUserAccount.getDocumentary();
+                        BigDecimal afterAmount = documentary.subtract(amount);
+                        sysUserAccountEntity.setHandlingFee(afterAmount);
+                    } else {
+                        BigDecimal promotion = sysUserAccount.getPromotion();
+                        BigDecimal afterAmount = promotion.subtract(amount);
+                        sysUserAccountEntity.setHandlingFee(afterAmount);
+                    }
+                }
+                sysUserAccountService.updateById(sysUserAccountEntity);
+            }
+            sysAmountAuditingVo.setAuditingStatus("3");
+            BeanUtils.copyProperties(sysAmountAuditingVo, sysAmountAuditingEntity);
+            baseMapper.updateById(sysAmountAuditingEntity);
+        }
+
+
+    }
+
+    @Override
+    public SysAmountAuditingEntity getByUserId(String userId) {
+        return  baseMapper.getByUserId(userId);
+    }
+}

+ 82 - 6
src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -3,14 +3,15 @@ package com.ydtech.modules.admin.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.dao.SysUserAccountMapper;
+import com.ydtech.modules.admin.model.po.SysAmountAuditingEntity;
 import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.po.SysUserAccountHistory;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.vo.SysUserAccountVo;
-import com.ydtech.modules.admin.service.SysUserAccountHistoryService;
-import com.ydtech.modules.admin.service.SysUserAccountService;
-import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
+import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -22,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Date;
 
 /**
  * @author Administrator
@@ -35,6 +37,11 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     private SysUserAccountHistoryService sysUserAccountHistoryService;
     @Autowired
     private EsmUserReferrerService esmUserReferrerService;
+    @Autowired
+    private SysAmountAuditingService sysAmountAuditingService;
+
+    @Autowired
+    private SysUserBankCardService sysUserBankCardService;
 
     @Override
     @Transactional
@@ -85,7 +92,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             if (sysUserAccountEntity.getPromotion() == null) {
                 sysUserAccountEntity.setPromotion(handlingFee);
             } else {
-                    remainingAmount = remainingAmount.add(sysUserAccountEntity.getPromotion());
+                remainingAmount = remainingAmount.add(sysUserAccountEntity.getPromotion());
 
             }
             sysUserAccountEntity.setHandlingFee(sysUserAccount.getHandlingFee().add(sysUserAccountEntity.getHandlingFee()));
@@ -119,11 +126,80 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         Page<SysUserAccount> page = new Page<>(sysUserAccountVo.getPageNum(), sysUserAccountVo.getPageSize());
         QueryWrapper<SysUserAccount> wrapper = new QueryWrapper<>();
 
-        Page<SysUserAccount> sysUserAccountHistoryPage  = baseMapper.queryPageOrder(sysUserAccountVo,page);
+        Page<SysUserAccount> sysUserAccountHistoryPage = baseMapper.queryPageOrder(sysUserAccountVo, page);
         return new BasePageResult<>(sysUserAccountVo.getPageNum(), page.getSize(), sysUserAccountHistoryPage.getTotal(), page.getPages(),
                 sysUserAccountHistoryPage.getRecords());
     }
 
+    @Override
+    @Transactional
+    public HttpResult<Object> inert(SysUserAccountVo sysUserAccountVo) {
+        String userId = sysUserAccountVo.getUserId();
+        BigDecimal zero = BigDecimal.ZERO;
+        BigDecimal beforeAmount;
+        BigDecimal afterAmount;
+//       用户当前金额
+        BigDecimal amount = sysUserAccountVo.getAmount();
+//       扣减后金额更改
+        SysUserAccountHistory sysUserAccountHistory = new SysUserAccountHistory();  // 记录
+        sysUserAccountHistory.setDocumentary(1);  // 1提现
+        sysUserAccountHistory.setUserId(sysUserAccountVo.getUserId());
+        SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();//审核记录表
+        sysAmountAuditingEntity.setUserId(sysUserAccountVo.getUserId());
+        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());
+            }
+        }
+
+
+        if (StringUtils.isNotEmpty(userId)) {
+            SysUserAccount sysUserAccount = baseMapper.getById(userId);
+
+            if (StringUtils.isNotEmpty(sysUserAccountVo.getAmountStatus())) {
+                sysUserAccountHistory.setProperty(Integer.valueOf(sysUserAccountVo.getAmountStatus()));   //金额类型
+
+                if ("1".equals(sysUserAccountVo.getAmountStatus())) {
+//                  用户当前费用金
+                    beforeAmount = sysUserAccount.getHandlingFee();
+                    afterAmount = beforeAmount.subtract(amount);
+                } else if ("2".equals(sysUserAccountVo.getAmountStatus())) {
+//                    用户当前 非跟单佣金
+                    beforeAmount = sysUserAccount.getDocumentary();
+                    afterAmount = beforeAmount.subtract(amount);
+                } else {
+                    beforeAmount = sysUserAccount.getPromotion();
+                    afterAmount = beforeAmount.subtract(amount);
+                }
+//              用户相差
+                if (beforeAmount.compareTo(zero) == 0 || afterAmount.compareTo(zero) < 0) {
+                    return HttpResult.ok("余额不足");
+                }
+                sysUserAccountHistory.setAmount(amount);  // 金额
+                sysUserAccountHistory.setSurplusAmount(afterAmount); // 剩余金额
+                sysAmountAuditingEntity.setCreateTime(new Date());
+                sysAmountAuditingEntity.setAuditingStatus("2");   // 2  为待审核  3  审核通过
+                sysAmountAuditingEntity.setAmountStatus(sysUserAccountVo.getAmountStatus());
+//              新增金额记录
+                sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
+                sysAmountAuditingService.save(sysAmountAuditingEntity);
+            }
+
+        }
+        return HttpResult.ok("提现成功,等待审核");
+    }
+
+
+
     private void judgeLevel(String userId, SysUserAccount sysUserAccountEntity, SysUserAccount newAccount) {
         if (!ObjectUtils.isNotEmpty(sysUserAccountEntity)) {
             sysUserAccountEntity = newAccount;
@@ -159,7 +235,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                                 sysUserAccountHistory.setSurplusAmount(byId.getPromotion() == null ? BigDecimal.ZERO.add(sysUserAccountEntity.getPromotion()) : byId.getPromotion().add(sysUserAccountEntity.getPromotion()));
                             }
                         }
-                        if(sysUserAccountHistory.getAmount().compareTo(BigDecimal.ZERO ) ==1){
+                        if (sysUserAccountHistory.getAmount().compareTo(BigDecimal.ZERO) == 1) {
                             sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
                         }
                     }

+ 6 - 0
src/main/java/com/ydtech/modules/admin/service/impl/SysUserBankCardServiceImpl.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.admin.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.dao.SysUserBankCardMapper;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
@@ -67,6 +68,11 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         BeanUtils.copyProperties(sysUserBankCardVO, sysUserBankCard);
         super.updateById(sysUserBankCard);
     }
+
+    @Override
+    public HttpResult<SysUserBankCardVO> getByUserId(String userId) {
+      return   baseMapper.getByUserId(userId) ;
+    }
 }
 
 

+ 38 - 0
src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.admin.dao.SysAmountAuditingMapper">
+
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.admin.model.po.SysAmountAuditingEntity">
+        <id property="id" column="id" jdbcType="INTEGER"/>
+        <result property="bankNumber" column="bank_number" jdbcType="VARCHAR"/>
+        <result property="amount" column="amount" jdbcType="DECIMAL"/>
+        <result property="userId" column="user_id" jdbcType="VARCHAR"/>
+        <result property="property" column="auditing_status" jdbcType="VARCHAR"/>
+        <result property="amountStatus" column="amount_status" jdbcType="VARCHAR"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+    </resultMap>
+
+
+
+    <select id="getByUserId" resultType="com.ydtech.modules.admin.model.po.SysAmountAuditingEntity">
+        select
+            a. id as  "id",
+            a. bank_number as  "bankNumber",
+            a. amount as  "amount",
+            a. user_id as  "userId",
+            a. auditing_status as  "auditingStatus",
+            a. amount_status as  "amountStatus"
+        from  sys_amount_auditing  a
+        <where>
+            a.auditing_status  ='2'
+            <if test="userId !=null and  userId !=''">
+              and  a.user_id =#{userId}
+            </if>
+        </where>
+
+    </select>
+
+
+</mapper>

+ 23 - 0
src/main/resources/mapper/modules/admin/SysUserAccountMapper.xml

@@ -56,6 +56,29 @@
             </if>
         </where>
     </select>
+    <select id="getById" resultType="com.ydtech.modules.admin.model.po.SysUserAccount">
+        select
+            a.user_id as "userId",
+            a.handling_fee as "handlingFee",
+            a.documentary as "documentary",
+            a.promotion as "promotion",
+            a.create_time as "createTime",
+            a.handling_amount_withdrawal as "handlingAmountWithdrawal",
+            a.handling_amount_account as "handlingAmountAccount",
+            a.handling_amount_payment as "handlingAmountPayment",
+            a.documentary_amount_withdrawal as "documentaryAmountWithdrawal",
+            a.documentary_amount_account as "documentaryAmountAccount",
+            a.documentary_amount_payment as "documentaryAmountPayment",
+            a.promotion_amount_withdrawal as "promotionAmountWithdrawal",
+            a.promotion_amount_account as "promotionAmountAccount",
+            a.promotion_amount_payment as "promotionAmountPayment"
+        from  sys_user_account a
+        <where>
+            <if test="userId != null and userId != ''">
+                and a.user_id = #{userId}
+            </if>
+        </where>
+    </select>
 
 
 </mapper>

+ 11 - 0
src/main/resources/mapper/modules/admin/SysUserBankCardMapper.xml

@@ -16,4 +16,15 @@
         id,bank_number,bank_account,
         user_id,create_time
     </sql>
+
+
+    <select id="getByUserId" resultType="com.ydtech.modules.admin.model.po.SysUserBankCard">
+            select
+                  a.id as "id",
+                  a.bank_number as "bankNumber",
+                  a.bank_account as "bankAccount",
+                  a.user_id as "userId"
+            from  sys_user_bank_card a
+
+    </select>
 </mapper>