APP提现详情

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

@@ -115,22 +115,25 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult edit(SysAgencyFeeApprovalEditDto sysAgencyFeeApprovalEditDto) {
+        SysAgencyFeeApproval sysAgencyFeeApproval1 = sysAgencyFeeApprovalMapper.selectById(sysAgencyFeeApprovalEditDto.getId());
         SysAgencyFeeApproval sysAgencyFeeApproval = new SysAgencyFeeApproval();
         String status = sysAgencyFeeApprovalEditDto.getStatus();
-        if (StringUtils.isNullOrEmpty(status) && status.equals("1")) {
+        if (StringUtils.isNotEmpty(status) && status.equals("1")) {
             //审批通过
             sysAgencyFeeApproval.setHistoryFee(sysAgencyFeeApproval.getCashFee());
             sysAgencyFeeApproval.setPicture(sysAgencyFeeApprovalEditDto.getPicture());
+            sysAgencyFeeApproval.setExtractFee(sysAgencyFeeApproval1.getExtractFee().subtract(sysAgencyFeeApproval.getCashFee()));
         }
+        sysAgencyFeeApproval.setId(sysAgencyFeeApprovalEditDto.getId());
         sysAgencyFeeApproval.setAuditTime(new Date());
         sysAgencyFeeApproval.setRemark(sysAgencyFeeApprovalEditDto.getRemark());
         sysAgencyFeeApproval.setStatus(status);
         sysAgencyFeeApproval.setAuditUser(BaseController.getUser().getName());
         //保存审批信息
         sysAgencyFeeApprovalMapper.updateById(sysAgencyFeeApproval);
-        SysAgencyFeeApproval sysAgencyFeeApproval1 = sysAgencyFeeApprovalMapper.selectById(sysAgencyFeeApprovalEditDto.getId());
+        SysAgencyFeeApproval sysAgencyFeeApproval2 = sysAgencyFeeApprovalMapper.selectById(sysAgencyFeeApprovalEditDto.getId());
         //保存审批记录
-        SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord = BeanUtil.copyProperties(sysAgencyFeeApproval1, SysAgencyFeeApprovalRecord.class);
+        SysAgencyFeeApprovalRecord sysAgencyFeeApprovalRecord = BeanUtil.copyProperties(sysAgencyFeeApproval2, SysAgencyFeeApprovalRecord.class);
         sysAgencyFeeApprovalRecord.setApprovalId(sysAgencyFeeApproval.getId());
         sysAgencyFeeApprovalRecord.setId(null);
         sysAgencyFeeApprovalRecord.setCreateTime(new Date());