Merge remote-tracking branch 'origin/master'

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysAmountAuditingServiceImpl.java

@@ -522,6 +522,13 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     public String exportYwyIORecs(YwyIOParam ywyIOParam) {
         log.info("导出业务员收支明细：ywyIOParam=[{}]", JSONUtil.toJsonStr(ywyIOParam));
         List<SysUserAccountChangeLog> changeLogs = sysUserAccountIncomeLogService.queryYwyIORecs(ywyIOParam);
+        for (SysUserAccountChangeLog changeLog : changeLogs) {
+            // 提现驳回的时候，金额设置为0
+            if("4".equals(String.valueOf(changeLog.getOperType()))){
+                changeLog.setRemark("提现驳回" + changeLog.getAmount());
+                changeLog.setAmount(BigDecimal.ZERO);
+            }
+        }
         log.info("导出业务员收支明细：ywyIOParam=[{}].导出[{}]条记录", JSONUtil.toJsonStr(ywyIOParam), CollUtil.size(changeLogs));
         String userName=null;
         if(CollUtil.isNotEmpty(changeLogs)){