手续费、推广费、非跟单费 审核提现

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

@@ -36,6 +36,19 @@ public class SysAmountAuditingEntity implements Serializable {
     @TableField(value = "amount")
     private BigDecimal amount;
 
+    /**
+     * 凭证号
+     */
+    @TableField(value = "voucher_id")
+    private String voucherId;
+
+
+    /**
+     * 图片ID
+     */
+    @TableField(value = "pic_id")
+    private String picId;
+
     /**
      * 创建时间
      */

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

@@ -33,6 +33,12 @@ public class SysAmountAuditingVo {
     @ApiModelProperty(value = "提现金额")
     private BigDecimal amount;
 
+    @ApiModelProperty(value = "凭证号")
+    private String voucherId;
+
+    @ApiModelProperty(value = "图片Id")
+    private String picId;
+
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;

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

@@ -33,37 +33,40 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     @Autowired
     private SysUserAccountService sysUserAccountService;
 
+    @Autowired
+    private SysAmountAuditingService sysAmountAuditingService;
+
     @Override
     @Transactional
     public void AmountReview(SysAmountAuditingVo sysAmountAuditingVo) {
 
-        SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();
+        SysAmountAuditingEntity sysAmountAuditingEntity = sysAmountAuditingService.getById(sysAmountAuditingVo.getId());
 
         BigDecimal amount = sysAmountAuditingVo.getAmount();
         String userId = sysAmountAuditingVo.getUserId();
-        SysUserAccount sysUserAccountEntity = new SysUserAccount();
+//        SysUserAccount sysUserAccountEntity = new SysUserAccount();
 //      用户扣减金额
         if (StringUtils.isNotEmpty(userId)) {
-            sysUserAccountEntity.setUserId(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);
+                        sysUserAccount.setHandlingAmountAccount(amount);
+                        sysUserAccount.setHandlingAmountPayment(sysUserAccount.getHandlingAmountPayment().subtract(amount));
+//                        sysUserAccountEntity.setHandlingFee(afterAmount);
                     } else if ("2".equals(amountStatus)) {
-                        BigDecimal documentary = sysUserAccount.getDocumentary();
-                        BigDecimal afterAmount = documentary.subtract(amount);
-                        sysUserAccountEntity.setDocumentary(afterAmount);
+                        sysUserAccount.setDocumentaryAmountAccount(amount);
+                        sysUserAccount.setDocumentaryAmountpayment(sysUserAccount.getDocumentaryAmountpayment().subtract(amount));
+//                        sysUserAccountEntity.setDocumentary(afterAmount);
                     } else {
-                        BigDecimal promotion = sysUserAccount.getPromotion();
-                        BigDecimal afterAmount = promotion.subtract(amount);
-                        sysUserAccountEntity.setPromotion(afterAmount);
+                        sysUserAccount.setPromotionAmountAccount(amount);
+                        sysUserAccount.setPromotionAmountPayment(sysUserAccount.getPromotionAmountPayment().subtract(amount));
+//                        sysUserAccountEntity.setPromotion(afterAmount);
                     }
                 }
-                sysUserAccountService.updateById(sysUserAccountEntity);
+                sysUserAccountService.updateById(sysUserAccount);
             }
             sysAmountAuditingVo.setAuditingStatus("3");
             sysAmountAuditingVo.setAuditingUserId(BaseController.getUser().getId());

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

@@ -73,8 +73,8 @@ public class SysDeptAccountWithdrawServiceImpl extends ServiceImpl<SysDeptAccoun
             sysDeptAccountService.updateById(sysDeptAccount);
         }
         sysDeptAccountWithdraw.setVoucherId(sysDeptAccountWithdraw.getVoucherId());
-        sysDeptAccountWithdraw.setAuditUserid(BaseController.getUser().getName());
-        sysDeptAccountWithdraw.setAuditName(BaseController.getUser().getId());
+        sysDeptAccountWithdraw.setAuditUserid(BaseController.getUser().getId());
+        sysDeptAccountWithdraw.setAuditName(BaseController.getUser().getName());
         sysDeptAccountWithdrawService.updateById(sysDeptAccountWithdraw);
         return HttpResult.ok("审核完成",sysDeptAccountWithdraw);
     }

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

@@ -49,6 +49,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 
     @Autowired
     private SysUserAccountHistoryService sysUserAccountHistoryService;
+
+    @Autowired
+    private SysUserAccountService sysUserAccountService;
+
     @Autowired
     private EsmUserReferrerService esmUserReferrerService;
     @Autowired
@@ -209,13 +213,22 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 //                  用户当前费用金
                     beforeAmount = sysUserAccount.getHandlingFee();
                     afterAmount = beforeAmount.subtract(amount);
+                    sysUserAccount.setHandlingFee(afterAmount);
+                    sysUserAccount.setHandlingAmountPayment(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.setDocumentaryAmountWithdrawal(sysUserAccount.getDocumentaryAmountWithdrawal().add(amount));
                 } else {
                     beforeAmount = sysUserAccount.getPromotion();
                     afterAmount = beforeAmount.subtract(amount);
+                    sysUserAccount.setPromotion(afterAmount);
+                    sysUserAccount.setPromotionAmountPayment(amount);
+                    sysUserAccount.setPromotionAmountWithdrawal(sysUserAccount.getPromotionAmountWithdrawal().add(amount));
                 }
 //              用户相差
                 if (beforeAmount.compareTo(zero) == 0 || afterAmount.compareTo(zero) < 0) {
@@ -230,7 +243,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 //              新增金额记录
                 sysAmountAuditingService.save(sysAmountAuditingEntity);
                 sysUserAccountHistory.setAuditiingId(sysAmountAuditingEntity.getId());
-
+                sysUserAccountService.updateById(sysUserAccount);
                 sysUserAccountHistoryService.updayteByUserAccount(sysUserAccountHistory);
             }
 

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

@@ -90,7 +90,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         long count = sysUserBankCardService.count(new QueryWrapper<SysUserBankCard>()
                 .eq("bank_number", sysUserBankCardVO.getBankNumber()));
         if (count > 0) {
-            throw new SystemException("该银行卡号以被绑定");
+            throw new SystemException("该银行卡号已被绑定");
         }
         String id = BaseController.getUser().getId();
         if (StringUtils.isNotEmpty(id)) {

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

@@ -100,6 +100,8 @@
         a.amount as "amount",
         a.user_id as "userId",
         a.create_time as "createTime",
+        a.voucher_id as "voucherId",
+        a.pic_id as "picId",
         a.auditing_status as "auditingStatus",
         a.amount_status as "amountStatus",
         a.auditing_time as "auditingTime",