Merge remote-tracking branch 'origin/test' into test

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

@@ -362,6 +362,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();//审核记录表
         sysAmountAuditingEntity.setUserId(userId);
         sysAmountAuditingEntity.setAmount(sysUserAccountVo.getAmount());
+        sysUserAccountHistory.setCreateTime(new Date());
 //        SysAmountAuditingEntity judge = sysAmountAuditingService.getByUserId(userId, sysUserAccountVo.getAmountStatus());
 //        if (ObjectUtils.isNotEmpty(judge)) {
 //            throw new SystemException("有未提现审核单据, 请审核完成之后再提现");
@@ -785,21 +786,21 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Override
     public SubOrder getSubOrderDetails(String subOrderId, String userId) {
         SubOrder subOrder=insAreaCompanyMapper.getSubOrderDetails(subOrderId);
-        subOrder.setAgentName("");
+        subOrder.setAgentName(this.getUserName(subOrder.getUserId()));
         subOrder.setAgentLevel("");
         //根据用户id查询分销等级
         InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getOne(new LambdaQueryWrapper<InsFeeOrderNew>()
                 .eq(InsFeeOrderNew::getInsOrderNo, subOrder.getSubOrderId()));
         if(userId.equals(insFeeOrderNew.getFirstLevelUserId())){
-            subOrder.setAgentName(this.getUserName(insFeeOrderNew.getFirstLevelUserId()));
+            //subOrder.setAgentName(this.getUserName(insFeeOrderNew.getFirstLevelUserId()));
             subOrder.setAgentLevel("一级分销代理");
         }
         if(userId.equals(insFeeOrderNew.getTwoLevelUserId())){
-            subOrder.setAgentName(this.getUserName(insFeeOrderNew.getTwoLevelUserId()));
+            //subOrder.setAgentName(this.getUserName(insFeeOrderNew.getTwoLevelUserId()));
             subOrder.setAgentLevel("二级分销代理");
         }
         if(userId.equals(insFeeOrderNew.getThreeLevelUserId())){
-            subOrder.setAgentName(this.getUserName(insFeeOrderNew.getThreeLevelUserId()));
+            //subOrder.setAgentName(this.getUserName(insFeeOrderNew.getThreeLevelUserId()));
             subOrder.setAgentLevel("三级分销代理");
         }
         return subOrder;
@@ -886,6 +887,21 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         } else {
             //其他板块预留逻辑处理
         }
+        List<MyCollectInAdvanceDto> recordsNew =new ArrayList<>();
+        if(orderVoPage.getRecords()!=null && orderVoPage.getRecords().size()>0){
+            for(MyCollectInAdvanceDto dto :orderVoPage.getRecords()) {
+                //车险的显示且收入
+                if ("1".equals(dto.getBusinessSegmentsType())) {
+                    if ("4".equals(dto.getTransactionType())) {
+                        dto.setTransactionType("1");
+                    } else if ("3".equals(dto.getTransactionType())) {
+                        dto.setTransactionType("2");
+                    }
+                }
+                recordsNew.add(dto);
+            }
+        }
+        orderVoPage.setRecords(recordsNew);
         BasePageResult<MyCollectInAdvanceDto> myCollectInAdvanceDtoBasePageResult = new BasePageResult<>(myCollectInAdvanceQueryDto.getPageNum(), myCollectInAdvanceQueryDto.getPageSize(), orderVoPage.getTotal(),
                 orderVoPage.getPages()
                 , orderVoPage.getRecords());
@@ -959,16 +975,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         if (myIncomeAndExpensesQueryDto.getTransactionType() != null && "0".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
             myIncomeAndExpensesQueryDto.setTransactionType(null);
         }
-        if (myIncomeAndExpensesQueryDto.getTransactionType() != null && "0".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+        if (myIncomeAndExpensesQueryDto.getIncomeAndExpensesType() != null && "0".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
             myIncomeAndExpensesQueryDto.setTransactionType(null);
         }
         // 1为车险板块  1 收入时
         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())) {
-            } else if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&"1".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
-            } else {
+            //判断收入类型  1 收入
+            if(StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  && "3".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
                 throw new SystemException("收入类型不能选择提现类型");
             }
         }
@@ -976,7 +989,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             //判断收入类型  1 收入  查询账号的历史记录表
             //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
             if(StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  && !"3".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
-                throw new SystemException("支出类型不能选择（手续+跟单）或者手续费类型");
+                throw new SystemException("支出类型不能选择（手续+跟单）或者手续费、退款类型");
             }
         }
         if ( (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) && StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) && "2".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&"1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()))

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1200,8 +1200,8 @@ handlingProportion,
         InsPlyIncome byId = baseMapper.getById(insPlyIncomeVo.getId());
         InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
         insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
-        insPlyIncome.setId(null);
         BeanUtils.copyProperties(byId,insPlyIncomeLog);
+        insPlyIncomeLog.setId(null);
         insPlyIncomeLog.setOperationStatus("2");
         insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
 
@@ -1223,8 +1223,8 @@ handlingProportion,
 
         InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
         insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
-        insPlyIncome.setId(null);
         BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setId(null);
         insPlyIncomeLog.setOperationStatus("2");
         insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
 
@@ -1462,8 +1462,8 @@ handlingProportion,
 
         InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
         insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
-        insPlyIncome.setId(null);
         BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setId(null);
         insPlyIncomeLog.setOperationStatus("1");
         insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
 
@@ -1514,8 +1514,8 @@ handlingProportion,
 
         InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
         insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
-        insPlyIncome.setId(null);
         BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setId(null);
         insPlyIncomeLog.setOperationStatus("3");
         insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
 

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesServiceImpl.java

@@ -101,7 +101,7 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
         settlementDocumentaryLogEntity.setAmountType("2");  //跟单费结算
         settlementDocumentaryLogEntity.setCreateTime(new Date());
         settlementDocumentaryLogService.save(settlementDocumentaryLogEntity);
-        return HttpResult.ok("结算成功");
+        return HttpResult.ok("开票成功");
     }
 
 
@@ -130,7 +130,6 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
             settlementDocumentaryLogEntity.setCreateTime(new Date());
             settlementDocumentaryLogService.save(settlementDocumentaryLogEntity);
             return HttpResult.ok("修改成功");
-
         }
         return null;
     }