查询bug处理

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

@@ -269,7 +269,7 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             //将收入支出状态台改为收入  2插入历史表中历史表
             sysUserAccountHistory.setId(null);
             sysUserAccountHistory.setDocumentary(2);
-            sysUserAccountHistory.setProperty(4);
+            sysUserAccountHistory.setProperty(5);
             sysUserAccountHistory.setBusinessSegmentsType(2); //赋值退款
             sysUserAccountHistory.setCreateTime(new Date());
             sysUserAccountHistoryMapper.insert(sysUserAccountHistory);

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

@@ -991,8 +991,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             }
         }
         if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) &&"2".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
-            //判断收入类型  1 收入  查询账号的历史记录表
-            //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
+            //判断支出类型
             if(StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  && !"3".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
                 throw new SystemException("支出类型不能选择（手续+跟单）或者手续费、退款类型");
             }
@@ -1000,21 +999,20 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         if ( (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) && StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) && "2".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&"1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()))
                 ||
                 (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) && ("2".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType())))){
-            //判断收入类型  1 收入  查询账号的历史记录表
-            //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
+            //判断退款类型
             if(StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&!"4".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
                 throw new SystemException("退款板块只能选择退款类型");
             }
         }
-        if ( StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&   StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) &&"1".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&"1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
-            //判断收入类型  1 收入  查询账号的历史记录表
-            //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
-            if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  && "2".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
-                myIncomeAndExpensesQueryDto.setTransactionType("3");
-            } else if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&"1".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
-                myIncomeAndExpensesQueryDto.setTransactionType("4");
-            }
+        //处理 手续费+跟单、推广费类型转换
+        if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  && "2".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            myIncomeAndExpensesQueryDto.setTransactionType("3");
+        } else if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&"1".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            myIncomeAndExpensesQueryDto.setTransactionType("4");
+        } else if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&"4".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            myIncomeAndExpensesQueryDto.setTransactionType("5");
         }
+        //处理收入和支出类型转换
         if (myIncomeAndExpensesQueryDto.getIncomeAndExpensesType() != null && "0".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
             myIncomeAndExpensesQueryDto.setIncomeAndExpensesType(null);
         } else if (myIncomeAndExpensesQueryDto.getIncomeAndExpensesType() != null && "1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
@@ -1039,6 +1037,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                     //退款 且退款
                 } else if ("2".equals(dto.getBusinessSegmentsType()) && "2".equals(dto.getIncomeAndExpensesType())){
                     dto.setIncomeAndExpensesType("1");
+                    dto.setTransactionType("4");
                     //提现
                 }else if("3".equals(dto.getTransactionType()) && "1".equals(dto.getIncomeAndExpensesType())){
                     dto.setIncomeAndExpensesType("2");