提现账户审核

src/main/java/com/ydtech/modules/admin/controller/SysUserBankController.java

@@ -67,6 +67,12 @@ public class SysUserBankController extends BaseController {
 
         return HttpResult.ok("新增成功");
     }
+    @PostMapping("/auditByBankNumber")
+    @ApiOperation("审核卡号开户行")
+    public HttpResult<Object> auditByBankNumber(@RequestBody SysUserBankCardVO sysUserBankCardVO) {
+        bankCardService.auditByBankNumber(sysUserBankCardVO);
+        return HttpResult.ok("新增成功");
+    }
 
     @GetMapping("getUserBankList")
     @ApiOperation("返回卡包")

src/main/java/com/ydtech/modules/admin/model/po/SysUserBankCard.java

@@ -49,6 +49,10 @@ public class SysUserBankCard implements Serializable {
     @TableField(value = "user_id")
     private String userId;
 
+    @TableField(value = "user_name")
+    private String userName;
+
+
     /**
      * 是否默认值
      */
@@ -62,6 +66,18 @@ public class SysUserBankCard implements Serializable {
     @TableField(value = "create_time",fill = FieldFill.INSERT_UPDATE)
     private Date createTime;
 
+    @TableField(value = "audit_status")
+    private String auditStatus;
+
+    @TableField(value = "audit_time")
+    private Date auditTime;
+
+    @TableField(value = "audit_user_id")
+    private String auditUserId;
+
+    @TableField(value = "audit_user_name")
+    private String auditUserName;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

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

@@ -42,6 +42,17 @@ public class SysUserBankCardVO {
     @TableField(value = "create_time",fill = FieldFill.INSERT_UPDATE)
     private Date createTime;
 
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+
+    @TableField(value = "audit_status")
+    private String auditStatus;
+
+    @TableField(value = "audit_time")
+    private Date auditTime;
+
+    @TableField(value = "audit_user_id")
+    private String auditUserId;
 
     @ApiModelProperty(value = "每页页数")
     @Min(value = 20, message = "页数最小为20")

src/main/java/com/ydtech/modules/admin/service/SysUserBankCardService.java

@@ -25,10 +25,12 @@ public interface SysUserBankCardService extends IService<SysUserBankCard> {
 
     void uodate(SysUserBankCardVO sysUserBankCardVO);
 
-    HttpResult<SysUserBankCardVO> getByUserId(String userId);
+    HttpResult<SysUserBankCardVO>   getByUserId(String userId);
 
     void insertByBankNumber(SysUserBankCardVO sysUserBankCardVO);
 
+    void auditByBankNumber(SysUserBankCardVO sysUserBankCardVO);
+
     HttpResult<List<SysUserBankCard>> getUserBankList();
 
 

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

@@ -212,10 +212,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         Long fromBankCardId = sysUserAccountVo.getFromBankCardId();
         if (fromBankCardId != null) {
             SysUserBankCard byId = sysUserBankCardService.getById(fromBankCardId);
-            String bankUserId = byId.getUserId();
-            if (!userId.equals(bankUserId)) {
-                return HttpResult.ok("非本人提现");
-            }
+//            String bankUserId = byId.getUserId();
+//            if (!userId.equals(bankUserId)) {
+//                return HttpResult.ok("非本人提现");
+//            }
             byId.setIsDefault(1);
 
             sysAmountAuditingEntity.setBankNumber(byId.getBankNumber());

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

@@ -44,8 +44,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
 
         LambdaQueryWrapper<SysUserBankCard> wrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotEmpty(sysUserBankCardVO.getBankNumber())) {
-            wrapper.eq(SysUserBankCard::getBankNumber, ObjectUtils.isNotEmpty(sysUserBankCardVO.getBankNumber()));
-
+            wrapper.eq(SysUserBankCard::getBankNumber, sysUserBankCardVO.getBankNumber());
         }
         if (StringUtils.isNotEmpty(sysUserBankCardVO.getBankAccount())) {
             wrapper.eq(SysUserBankCard::getBankAccount, sysUserBankCardVO.getBankAccount());
@@ -53,6 +52,12 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         if (StringUtils.isNotEmpty(sysUserBankCardVO.getBankAddress())) {
             wrapper.eq(SysUserBankCard::getBankAddress, sysUserBankCardVO.getBankAddress());
         }
+        if (StringUtils.isNotEmpty(sysUserBankCardVO.getUserName())) {
+            wrapper.eq(SysUserBankCard::getUserName, sysUserBankCardVO.getUserName());
+        }
+        if (sysUserBankCardVO.getAuditStatus() != null) {
+            wrapper.eq(SysUserBankCard::getAuditStatus, sysUserBankCardVO.getAuditStatus());
+        }
         Page<SysUserBankCard> insOrdersPage = page(page, wrapper);
         return new BasePageResult<>(sysUserBankCardVO.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
                 insOrdersPage.getRecords());
@@ -100,9 +105,23 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
 
         BeanUtils.copyProperties(sysUserBankCardVO, sysUserBankCard);
         sysUserBankCard.setCreateTime(new Date());
+        sysUserBankCard.setAuditStatus("0"); //待审核
+        sysUserBankCard.setUserName(BaseController.getUser().getName());
+
         baseMapper.insert(sysUserBankCard);
     }
 
+    @Override
+    @Transactional
+    public void auditByBankNumber(SysUserBankCardVO sysUserBankCardVO) {
+        SysUserBankCard sysUserBankCard =  sysUserBankCardService.getById(sysUserBankCardVO.getId());
+        sysUserBankCard.setAuditStatus(sysUserBankCardVO.getAuditStatus());
+        sysUserBankCard.setAuditTime(new Date());
+        sysUserBankCard.setAuditUserId(BaseController.getUser().getId());
+        sysUserBankCard.setAuditUserName(BaseController.getUser().getName());
+        sysUserBankCardService.updateById(sysUserBankCard);
+    }
+
     @Override
     public HttpResult<List<SysUserBankCard>> getUserBankList() {
         String userId = BaseController.getUser().getId();

src/main/resources/mapper/modules/admin/SysUserAccountMapper.xml

@@ -15,7 +15,7 @@
             <result property="handlingAmountPayment" column="handling_amount_payment" jdbcType="DECIMAL"/>
             <result property="documentaryAmountWithdrawal" column="documentary_amount_withdrawal" jdbcType="DECIMAL"/>
             <result property="documentaryAmountAccount" column="documentary_amount_account" jdbcType="DECIMAL"/>
-            <result property="documentaryAmountPayment" column="documentary_amount_payment" jdbcType="DECIMAL"/>
+            <result property="documentaryAmountpayment" column="documentary_amount_payment" jdbcType="DECIMAL"/>
             <result property="promotionAmountWithdrawal" column="promotion_amount_withdrawal" jdbcType="DECIMAL"/>
             <result property="promotionAmountAccount" column="promotion_amount_account" jdbcType="DECIMAL"/>
             <result property="promotionAmountPayment" column="promotion_amount_payment" jdbcType="DECIMAL"/>
@@ -54,6 +54,9 @@
             <if test="sysUserAccountVo.userId != null and sysUserAccountVo.userId != ''">
                 and a.user_id = #{sysUserAccountVo.userId}
             </if>
+            <if test="sysUserAccountVo.deptId != null and sysUserAccountVo.deptId != ''">
+                and b.dept_id like concat(#{sysUserAccountVo.deptId},'%')
+            </if>
         </where>
     </select>
     <select id="getById" resultType="com.ydtech.modules.admin.model.po.SysUserAccount">