账户可多次提现

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

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

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

@@ -109,8 +109,11 @@ public class SysUserAccount implements Serializable {
     private  String  documentaryStatus;
     @TableField(exist = false)
     private String  suborderId;
+    @TableField(exist = false)
     private  String  deptName;
+    @TableField(exist = false)
     private  String  name;
+    @TableField(exist = false)
     private  String  deptId;
 
     @ApiModelProperty(value = "所属账户下的卡")

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

@@ -213,10 +213,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();//审核记录表
         sysAmountAuditingEntity.setUserId(userId);
         sysAmountAuditingEntity.setAmount(sysUserAccountVo.getAmount());
-        SysAmountAuditingEntity judge = sysAmountAuditingService.getByUserId(userId, sysUserAccountVo.getAmountStatus());
-        if (ObjectUtils.isNotEmpty(judge)) {
-            return HttpResult.ok("有未提现审核单据, 请审核完成之后再提现");
-        }
+//        SysAmountAuditingEntity judge = sysAmountAuditingService.getByUserId(userId, sysUserAccountVo.getAmountStatus());
+//        if (ObjectUtils.isNotEmpty(judge)) {
+//            return HttpResult.ok("有未提现审核单据, 请审核完成之后再提现");
+//        }
 //      通过银行卡id 查询卡包
         String fromBankCardId = sysUserAccountVo.getFromBankCardId();
         if (fromBankCardId != null) {
@@ -244,20 +244,20 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                     beforeAmount = sysUserAccount.getHandlingFee();
                     afterAmount = beforeAmount.subtract(amount);
                     sysUserAccount.setHandlingFee(afterAmount);
-                    sysUserAccount.setHandlingAmountPayment(amount);
+                    sysUserAccount.setHandlingAmountPayment(sysUserAccount.getHandlingAmountPayment().add(amount));
                     sysUserAccount.setHandlingAmountWithdrawal(sysUserAccount.getHandlingAmountWithdrawal().add(amount));
                 } else if ("2".equals(sysUserAccountVo.getAmountStatus())) {
 //                    用户当前 非跟单佣金
                     beforeAmount = sysUserAccount.getDocumentary();
                     afterAmount = beforeAmount.subtract(amount);
                     sysUserAccount.setDocumentary(afterAmount);
-                    sysUserAccount.setDocumentaryAmountpayment(amount);
+                    sysUserAccount.setDocumentaryAmountpayment(sysUserAccount.getDocumentaryAmountpayment().add(amount));
                     sysUserAccount.setDocumentaryAmountWithdrawal(sysUserAccount.getDocumentaryAmountWithdrawal().add(amount));
                 } else {
                     beforeAmount = sysUserAccount.getPromotion();
                     afterAmount = beforeAmount.subtract(amount);
                     sysUserAccount.setPromotion(afterAmount);
-                    sysUserAccount.setPromotionAmountPayment(amount);
+                    sysUserAccount.setPromotionAmountPayment(sysUserAccount.getPromotionAmountPayment().add(amount));
                     sysUserAccount.setPromotionAmountWithdrawal(sysUserAccount.getPromotionAmountWithdrawal().add(amount));
                 }
 //              用户相差
@@ -296,10 +296,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();//审核记录表
         sysAmountAuditingEntity.setUserId(userId);
         sysAmountAuditingEntity.setAmount(sysUserAccountVo.getAmount());
-        SysAmountAuditingEntity judge = sysAmountAuditingService.getByUserId(userId, sysUserAccountVo.getAmountStatus());
-        if (ObjectUtils.isNotEmpty(judge)) {
-            throw new SystemException("有未提现审核单据, 请审核完成之后再提现");
-        }
+//        SysAmountAuditingEntity judge = sysAmountAuditingService.getByUserId(userId, sysUserAccountVo.getAmountStatus());
+//        if (ObjectUtils.isNotEmpty(judge)) {
+//            throw new SystemException("有未提现审核单据, 请审核完成之后再提现");
+//        }
 //      通过银行卡id 查询卡包
         String fromBankCardId = sysUserAccountVo.getFromBankCardId();
         SysUserBankCard byId = sysUserBankCardService.getByBankNumber(fromBankCardId);
@@ -326,20 +326,20 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                     beforeAmount = sysUserAccount.getHandlingFee();
                     afterAmount = beforeAmount.subtract(amount);
                     sysUserAccount.setHandlingFee(afterAmount);
-                    sysUserAccount.setHandlingAmountPayment(amount);
+                    sysUserAccount.setHandlingAmountPayment(sysUserAccount.getHandlingAmountPayment().add(amount));
                     sysUserAccount.setHandlingAmountWithdrawal(sysUserAccount.getHandlingAmountWithdrawal().add(amount));
                 } else if ("2".equals(sysUserAccountVo.getAmountStatus())) {
 //                    用户当前 非跟单佣金
                     beforeAmount = sysUserAccount.getDocumentary();
                     afterAmount = beforeAmount.subtract(amount);
                     sysUserAccount.setDocumentary(afterAmount);
-                    sysUserAccount.setDocumentaryAmountpayment(amount);
+                    sysUserAccount.setDocumentaryAmountpayment(sysUserAccount.getDocumentaryAmountpayment().add(amount));
                     sysUserAccount.setDocumentaryAmountWithdrawal(sysUserAccount.getDocumentaryAmountWithdrawal().add(amount));
                 } else {
                     beforeAmount = sysUserAccount.getPromotion();
                     afterAmount = beforeAmount.subtract(amount);
                     sysUserAccount.setPromotion(afterAmount);
-                    sysUserAccount.setPromotionAmountPayment(amount);
+                    sysUserAccount.setPromotionAmountPayment(sysUserAccount.getPromotionAmountPayment().add(amount));
                     sysUserAccount.setPromotionAmountWithdrawal(sysUserAccount.getPromotionAmountWithdrawal().add(amount));
                 }
 //              用户相差

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

@@ -9,7 +9,7 @@
         <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="auditingStatus" column="auditing_status" jdbcType="VARCHAR"/>
         <result property="amountStatus" column="amount_status" jdbcType="VARCHAR"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
     </resultMap>

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

@@ -121,13 +121,14 @@
         left join   sys_dept  sd  on  sd.id =b.dept_id
         left join   sys_user_bank_card c on c.user_id = a.user_id and c.audit_status = '1'
         <where>
+            1=1
             <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>
-            <if test="sysUserAccountVo.deptId != null and sysUserAccountVo.deptId != ''">
+            <if test="sysUserAccountVo.bankNumber != null and sysUserAccountVo.bankNumber != ''">
                 and c.bank_number = #{sysUserAccountVo.bankNumber}
             </if>
         </where>