处理查询列表参数bug以及其他bug

src/main/java/com/ydtech/constants/enums/dict/BusinessSegmentsEnum.java

@@ -6,10 +6,9 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-@DictEnum(key = "businessSegmentsType", desc = "业务板块")
+@DictEnum(key = "businessSegmentsType", desc = "预收业务板块")
 public enum BusinessSegmentsEnum implements IBaseEnum {
   BT001("1", "车险", 1, 0);
-
   private String code;
   private String desc;
   //排序

src/main/java/com/ydtech/constants/enums/dict/BusinessSegmentsSZEnum.java

@@ -0,0 +1,22 @@
+package com.ydtech.constants.enums.dict;
+
+import com.ydtech.aop.request.DictEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@DictEnum(key = "businessSegmentsSZType", desc = "收支业务板块")
+public enum BusinessSegmentsSZEnum implements IBaseEnum {
+  BT000("0", "全部", 0, 0),
+  BT001("1", "车险", 1, 0),
+  BT002("2", "退款", 2, 0);
+  private String code;
+  private String desc;
+  //排序
+  private Integer sort;
+  //状态  0 启用  1 不启用
+  private Integer status;
+
+
+ }

src/main/java/com/ydtech/constants/enums/dict/IncomeAndExpensesEnum.java

@@ -8,6 +8,7 @@ import lombok.Getter;
 @AllArgsConstructor
 @DictEnum(key = "incomeAndExpensesType", desc = "收支类型")
 public enum IncomeAndExpensesEnum implements IBaseEnum {
+    M_0("0", "全部",0,0),
     M_1("1", "收入",1,0),
     M_2("2", "支出",2,0);
     private String code;

src/main/java/com/ydtech/constants/enums/dict/MoneyAttrEnum.java

@@ -8,9 +8,11 @@ import lombok.Getter;
 @AllArgsConstructor
 @DictEnum(key = "moneyAttrType", desc = "交易类型")
 public enum MoneyAttrEnum implements IBaseEnum {
+    M_0("0", "全部",0,0),
     M_1("1", "手续+跟单费",1,0),
     M_2("2", "推广费",2,0),
-    M_3("3", "提现",3,0);
+    M_3("3", "提现",3,0),
+    M_4("4", "退款",4,0);
     private String code;
     private String desc;
     //排序

src/main/java/com/ydtech/modules/admin/controller/SysAmountAuditingController.java

@@ -56,12 +56,7 @@ public class SysAmountAuditingController extends BaseController {
     @PostMapping("rejectAmount")
     @ApiOperation("驳回")
     public HttpResult<Object> rejectAmount(@RequestBody SysAmountRejectVo sysAmountRejectVo) {
-        try{
-            sysAmountAuditingService.rejectAmount(sysAmountRejectVo);
-        }catch(Exception e){
-            return HttpResult.error("驳回失败");
-        }
-       // sysAmountAuditingService.rejectAmount(id);
+         sysAmountAuditingService.rejectAmount(sysAmountRejectVo);
         return HttpResult.ok("驳回成功");
     }
 }

src/main/java/com/ydtech/modules/admin/controller/SysUserAccountController.java

@@ -151,7 +151,7 @@ public class SysUserAccountController extends BaseController {
     @PostMapping("findMyIncomeAndExpensesByUserId")
     @ApiOperation("查询我的收支明细")
     public HttpResult<MyCollectInAdvanceAllDto>  findIncomeAndExpensesByUserId(@RequestBody MyIncomeAndExpensesQueryDto myIncomeAndExpensesQueryDto){
-        return  HttpResult.ok(sysUserAccountService.findIncomeAndExpensesByUserId(myIncomeAndExpensesQueryDto));
+      return  HttpResult.ok(sysUserAccountService.findIncomeAndExpensesByUserId(myIncomeAndExpensesQueryDto));
     }
 
     /**
@@ -173,4 +173,10 @@ public class SysUserAccountController extends BaseController {
     }
     **/
 
+    @GetMapping("findRefundDetailById")
+    @ApiOperation("退款详情")
+    public HttpResult<RefundDetalsDto>  findRefundDetailById(String  id){
+        return  HttpResult.ok(sysUserAccountService.findRefundDetailById(id));
+    }
+
 }

src/main/java/com/ydtech/modules/admin/model/dto/MyCollectInAdvanceDto.java

@@ -43,10 +43,10 @@ public class MyCollectInAdvanceDto {
 
 
     /***
-     * 银行卡号
+     * 交易号
      */
-    @ApiModelProperty(value = "银行卡号")
-    private String  bankNumber;
+    @ApiModelProperty(value = "交易号")
+    private String  auditiingId;
 
     /***
      * 创建时间
@@ -54,11 +54,6 @@ public class MyCollectInAdvanceDto {
     @ApiModelProperty(value = "支出时间")
     private String   createTime;
 
-    /***
-     * 提现金额
-     */
-    @ApiModelProperty(value = "提现金额")
-    private BigDecimal ransactionAmount;
 
 
     @ApiModelProperty(value = "业务板块")

src/main/java/com/ydtech/modules/admin/model/dto/RefundDetalsDto.java

@@ -0,0 +1,43 @@
+package com.ydtech.modules.admin.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2024/6/20 13:50
+ *  @Description: 体现详情
+ */
+@ApiModel("退款详情")
+@Data
+public class RefundDetalsDto {
+
+    /***
+     * 退款时间
+     */
+    @ApiModelProperty("退款时间")
+    private String  refundTime;
+
+    /***
+     * 退款金额
+     */
+    @ApiModelProperty("退款金额")
+    private BigDecimal  refundAmount;
+
+
+    @ApiModelProperty("交易编号")
+    private String transactionNumber;
+
+    public RefundDetalsDto() {
+    }
+
+    public RefundDetalsDto(String refundTime, BigDecimal refundAmount, String transactionNumber) {
+        this.refundTime = refundTime;
+        this.refundAmount = refundAmount;
+        this.transactionNumber = transactionNumber;
+    }
+}

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

@@ -51,7 +51,7 @@ public class SysUserAccountHistory implements Serializable {
     private Integer documentary;
 
     /**
-     * 金钱属性 1 手续费 2 非跟单 3 推广  4 手续费+非跟单
+     * 金钱属性 1 手续费 2 非跟单 3 推广  4 手续费+非跟单    4 为 退款
      */
     @TableField(value = "property")
     private Integer property;

src/main/java/com/ydtech/modules/admin/service/SysUserAccountService.java

@@ -74,4 +74,11 @@ public interface SysUserAccountService extends IService<SysUserAccount> {
      *  @Description:  获取订单的详情
      */
     OrderDetalsDto findOrderDetailById(String subOrderId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/21 18:25
+     *  @Description: 查看退款详情
+     */
+    RefundDetalsDto findRefundDetailById(String id);
 }

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

@@ -266,7 +266,14 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             //插入轨迹表驳回数据
             SysAmountAuditingHistory sysAmountAuditingHistory =new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId,new Date(),"3", "3",sysUserAccountHistory.getId());
             sysAmountAuditingHistoryService.save(sysAmountAuditingHistory);
-            //是否更新历史表为支出待定
+            //将收入支出状态台改为收入  2插入历史表中历史表
+            sysUserAccountHistory.setId(null);
+            sysUserAccountHistory.setDocumentary(2);
+            sysUserAccountHistory.setProperty(4);
+            sysUserAccountHistory.setBusinessSegmentsType(2); //赋值退款
+            sysUserAccountHistory.setCreateTime(new Date());
+            sysUserAccountHistoryMapper.insert(sysUserAccountHistory);
+
         }
     }
     /**

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

@@ -35,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -251,6 +252,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)) {
 //            return HttpResult.ok("有未提现审核单据, 请审核完成之后再提现");
@@ -325,12 +327,12 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
            // }
             // 提现审核插入轨迹表   待审核数据 和审核处理中的数据
 
-            Calendar calendar = Calendar.getInstance();
-            Date date = calendar.getTime();
-            calendar.add(Calendar.MINUTE, 1);
-            Date afterDate = calendar.getTime();
+           // Calendar calendar = Calendar.getInstance();
+            Date date = new Date();
+            //calendar.add(Calendar.MINUTE, 1);
+           // Date afterDate = calendar.getTime();
             SysAmountAuditingHistory sysAmountAuditingHistory =new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId,date,"1", "1",sysUserAccountHistory.getId());
-            SysAmountAuditingHistory sysAmountAuditingHistoryTwo =new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId,afterDate, "2", "1",sysUserAccountHistory.getId());
+            SysAmountAuditingHistory sysAmountAuditingHistoryTwo =new SysAmountAuditingHistory(null, sysAmountAuditingEntity.getId(), amount, userId,date, "2", "1",sysUserAccountHistory.getId());
             sysAmountAuditingHistoryService.save(sysAmountAuditingHistory);
             sysAmountAuditingHistoryService.save(sysAmountAuditingHistoryTwo);
 
@@ -852,10 +854,12 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             throw new SystemException("用户id-userId不能为空");
         }
         BigDecimal sumAmount=BigDecimal.ZERO;
+
         //判断时间类型  1.一周内  2. 一月内  3. 三月内  4. 三月内
-        HashMap<String, String> dateMap = getDateMapByType(myCollectInAdvanceQueryDto.getDateQueryType());
+        HashMap<String, String> dateMap = getDateMapByType(myCollectInAdvanceQueryDto.getDateQueryType(),myCollectInAdvanceQueryDto.getStartDate(),myCollectInAdvanceQueryDto.getEndDate());
         myCollectInAdvanceQueryDto.setStartDate(dateMap.get("startDate"));
         myCollectInAdvanceQueryDto.setEndDate(dateMap.get("endDate"));
+
         if(myCollectInAdvanceQueryDto.getBusinessSegmentsType()==null || "".equals(myCollectInAdvanceQueryDto.getBusinessSegmentsType())){
             myCollectInAdvanceQueryDto.setBusinessSegmentsType("1");
         }
@@ -893,7 +897,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
      *  @Date: 2024/6/19 11:57
      *  @Description:  通过时间类型判断
      */
-    private static HashMap<String,String> getDateMapByType(String type) {
+    private static HashMap<String,String> getDateMapByType(String type,String startDate,String endDate) {
         HashMap<String,String> map =new HashMap<>();
         String  startDateStr="";
         String  endDateStr="";
@@ -917,6 +921,9 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             // 三月内
             startDateStr=SliceUpDateUtil.getThreeMonthFirstAndLastDay(new Date(),1,6)+" 00:00:00";
             endDateStr=SliceUpDateUtil.getThreeMonthFirstAndLastDay(new Date(),2,6)+" 23:59:59";
+        }else{
+            startDateStr= StringUtils.isNotBlank(startDate)?startDate+" 00:00:00":null;
+            endDateStr= StringUtils.isNotBlank(endDate)?endDate+" 23:59:59":null;
         }
         map.put("startDate",startDateStr);
         map.put("endDate",endDateStr);
@@ -931,92 +938,104 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
      */
     @Override
     public MyCollectInAdvanceAllDto findIncomeAndExpensesByUserId(MyIncomeAndExpensesQueryDto myIncomeAndExpensesQueryDto) {
-        if(StringUtils.isBlank(myIncomeAndExpensesQueryDto.getUserId())){
+        if (StringUtils.isBlank(myIncomeAndExpensesQueryDto.getUserId())) {
             throw new SystemException("用户id-userId不能为空");
         }
-        BigDecimal sumAmountSR=BigDecimal.ZERO;
-        BigDecimal sumAmountZC=BigDecimal.ZERO;
-        BasePageResult<MyCollectInAdvanceDto> myCollectInAdvanceDtoBasePageResult=new BasePageResult<MyCollectInAdvanceDto>();
+        BigDecimal sumAmountSR = BigDecimal.ZERO;
+        BigDecimal sumAmountZC = BigDecimal.ZERO;
+        BasePageResult<MyCollectInAdvanceDto> myCollectInAdvanceDtoBasePageResult = new BasePageResult<MyCollectInAdvanceDto>();
+
         //判断时间类型  1.一周内  2. 一月内  3. 三月内  4. 三月内
-        HashMap<String, String> dateMap = getDateMapByType(myIncomeAndExpensesQueryDto.getDateQueryType());
+        HashMap<String, String> dateMap = getDateMapByType(myIncomeAndExpensesQueryDto.getDateQueryType(), myIncomeAndExpensesQueryDto.getStartDate(), myIncomeAndExpensesQueryDto.getEndDate());
         myIncomeAndExpensesQueryDto.setStartDate(dateMap.get("startDate"));
         myIncomeAndExpensesQueryDto.setEndDate(dateMap.get("endDate"));
+
         Page<MyCollectInAdvanceDto> page = new Page<>(myIncomeAndExpensesQueryDto.getPageNum(), myIncomeAndExpensesQueryDto.getPageSize());
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
         Page<MyCollectInAdvanceDto> orderVoPage = new Page<>();
-        if(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()==null || "".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType())){
-            myIncomeAndExpensesQueryDto.setBusinessSegmentsType("1");
+        if (myIncomeAndExpensesQueryDto.getBusinessSegmentsType() != null && "0".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType())) {
+            myIncomeAndExpensesQueryDto.setBusinessSegmentsType(null);
         }
-        if(myIncomeAndExpensesQueryDto.getTransactionType()==null || "".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
-            myIncomeAndExpensesQueryDto.setTransactionType("1");
+        if (myIncomeAndExpensesQueryDto.getTransactionType() != null && "0".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            myIncomeAndExpensesQueryDto.setTransactionType(null);
         }
-        if(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()==null || "".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())){
-            myIncomeAndExpensesQueryDto.setIncomeAndExpensesType("1");
+        if (myIncomeAndExpensesQueryDto.getTransactionType() != null && "0".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            myIncomeAndExpensesQueryDto.setTransactionType(null);
         }
-        // 1为车险板块
-        if ("1".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType())) {
+        // 1为车险板块  1 收入时
+        if ( StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&   StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) &&"1".equals(myIncomeAndExpensesQueryDto.getBusinessSegmentsType()) &&"1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
             //判断收入类型  1 收入  查询账号的历史记录表
-            if("1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())){
-
-                //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
-                if("2".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
-                    myIncomeAndExpensesQueryDto.setTransactionType("3");
-                }else if("1".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
-                    myIncomeAndExpensesQueryDto.setTransactionType("4");
-                }else{
-                    throw new SystemException("收入类型不能选择提现类型");
-                }
-                myIncomeAndExpensesQueryDto.setIncomeAndExpensesType("2");
-                orderVoPage = sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserId(page,myIncomeAndExpensesQueryDto);
-                Long total=sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserIdCount(myIncomeAndExpensesQueryDto);
-                orderVoPage.setTotal(total);
-
-                sumAmountSR=sysUserAccountHistoryService.findSumAmount(myIncomeAndExpensesQueryDto);
-                sumAmountZC=sysUserAccountHistoryService.findSumAmountByUserId(myIncomeAndExpensesQueryDto.getUserId(),"1");
-                List<MyCollectInAdvanceDto> recordsNew =new ArrayList<>();
-                if(orderVoPage.getRecords()!=null && orderVoPage.getRecords().size()>0){
-                    for(MyCollectInAdvanceDto dto :orderVoPage.getRecords()){
-                        if ("4".equals(dto.getTransactionType())) {
-                            dto.setTransactionType("1");
-                        }else if("3".equals(dto.getTransactionType())){
-                            dto.setTransactionType("2");
-                        }
-                        dto.setIncomeAndExpensesType("1");
-                        recordsNew.add(dto);
-                    }
-                }
-                orderVoPage.setRecords(recordsNew);
-                myCollectInAdvanceDtoBasePageResult=new BasePageResult<>(myIncomeAndExpensesQueryDto.getPageNum(), myIncomeAndExpensesQueryDto.getPageSize(), orderVoPage.getTotal(),
-                        orderVoPage.getPages()
-                        , orderVoPage.getRecords());
-                // 2.支出   查看提现记录表
-            }else if("2".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())){
-                //金额类型 3
-                if(!"3".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
-                    throw new SystemException("支出类型不能选择（手续+跟单）或者手续费类型");
-                }
-                myIncomeAndExpensesQueryDto.setIncomeAndExpensesType("1");
-                orderVoPage = sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserId(page,myIncomeAndExpensesQueryDto);
-                Long total=sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserIdCount(myIncomeAndExpensesQueryDto);
-                orderVoPage.setTotal(total);
-                List<MyCollectInAdvanceDto> recordsNew =new ArrayList<>();
-                if(orderVoPage.getRecords()!=null && orderVoPage.getRecords().size()>0){
-                    for(MyCollectInAdvanceDto dto :orderVoPage.getRecords()){
-                        dto.setIncomeAndExpensesType("2");
-                        recordsNew.add(dto);
+            //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
+            if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  && "2".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            } else if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  &&"1".equals(myIncomeAndExpensesQueryDto.getTransactionType())) {
+            } else {
+                throw new SystemException("收入类型不能选择提现类型");
+            }
+        }
+        if (StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType()) &&"2".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
+            //判断收入类型  1 收入  查询账号的历史记录表
+            //金额类型 1. 手续费金额 +跟单金额  2. 推广金额
+            if(StringUtils.isNotBlank(myIncomeAndExpensesQueryDto.getTransactionType())  && !"3".equals(myIncomeAndExpensesQueryDto.getTransactionType())){
+                throw new SystemException("支出类型不能选择（手续+跟单）或者手续费类型");
+            }
+        }
+        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 (myIncomeAndExpensesQueryDto.getIncomeAndExpensesType() != null && "0".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
+            myIncomeAndExpensesQueryDto.setIncomeAndExpensesType(null);
+        } else if (myIncomeAndExpensesQueryDto.getIncomeAndExpensesType() != null && "1".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())) {
+            myIncomeAndExpensesQueryDto.setIncomeAndExpensesType("2");
+        } else if (myIncomeAndExpensesQueryDto.getIncomeAndExpensesType() != null && "2".equals(myIncomeAndExpensesQueryDto.getIncomeAndExpensesType())){
+            myIncomeAndExpensesQueryDto.setIncomeAndExpensesType("1");
+        }
+        orderVoPage = sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserId(page,myIncomeAndExpensesQueryDto);
+        Long total=sysUserAccountHistoryService.findMyIncomeAndExpensesAmountByUserIdCount(myIncomeAndExpensesQueryDto);
+        orderVoPage.setTotal(total);
+        List<MyCollectInAdvanceDto> recordsNew =new ArrayList<>();
+        if(orderVoPage.getRecords()!=null && orderVoPage.getRecords().size()>0){
+            for(MyCollectInAdvanceDto dto :orderVoPage.getRecords()) {
+                //车险的显示且收入
+                if ("1".equals(dto.getBusinessSegmentsType()) && "2".equals(dto.getIncomeAndExpensesType())) {
+                    if ("4".equals(dto.getTransactionType())) {
+                        dto.setTransactionType("1");
+                    } else if ("3".equals(dto.getTransactionType())) {
+                        dto.setTransactionType("2");
                     }
+                    dto.setIncomeAndExpensesType("1");
+                    //退款 且退款
+                } else if ("2".equals(dto.getBusinessSegmentsType()) && "2".equals(dto.getIncomeAndExpensesType())){
+                    dto.setIncomeAndExpensesType("1");
+                    //提现
+                }else if("3".equals(dto.getTransactionType()) && "1".equals(dto.getIncomeAndExpensesType())){
+                    dto.setIncomeAndExpensesType("2");
                 }
-                orderVoPage.setRecords(recordsNew);
-                myCollectInAdvanceDtoBasePageResult=new BasePageResult<>(myIncomeAndExpensesQueryDto.getPageNum(), myIncomeAndExpensesQueryDto.getPageSize(), orderVoPage.getTotal(),
-                        orderVoPage.getPages()
-                        , orderVoPage.getRecords());
-                sumAmountSR=sysUserAccountHistoryService.findSumAmountByUserId(myIncomeAndExpensesQueryDto.getUserId(),"2");
-                sumAmountZC=sysUserAccountHistoryService.findSumAmount(myIncomeAndExpensesQueryDto);
+                recordsNew.add(dto);
             }
-
-        } else {
-            //其他板块预留逻辑处理
         }
+        orderVoPage.setRecords(recordsNew);
+        myCollectInAdvanceDtoBasePageResult = new BasePageResult<>(myIncomeAndExpensesQueryDto.getPageNum(), myIncomeAndExpensesQueryDto.getPageSize(), orderVoPage.getTotal(),
+                orderVoPage.getPages()
+                , orderVoPage.getRecords());
+        //
+
+        sumAmountSR=sysUserAccountHistoryService.findSumAmountByUserId(myIncomeAndExpensesQueryDto.getUserId(),"2");
+        sumAmountZC=sysUserAccountHistoryService.findSumAmountByUserId(myIncomeAndExpensesQueryDto.getUserId(),"1");
         return new MyCollectInAdvanceAllDto(sumAmountSR,sumAmountZC,myCollectInAdvanceDtoBasePageResult);
     }
     /**
@@ -1098,4 +1117,20 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     public OrderDetalsDto findOrderDetailById(String subOrderId) {
         return null;
     }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/6/21 18:27
+     *  @Description: 查看退款详情
+     */
+    @Override
+    public RefundDetalsDto findRefundDetailById(String id) {
+        //id为历史表的id
+        //通过历史记录表查询数据
+        SysUserAccountHistory his = sysUserAccountHistoryService.getById(id);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String dateStr = sdf.format(his.getCreateTime());
+        return new RefundDetalsDto(dateStr,his.getAmount(),his.getAuditiingId());
+    }
 }

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

@@ -112,24 +112,25 @@
             business_eegments_type  as "businessSegmentsType",
             his.documentary as "incomeAndExpensesType",
             his.property  as  "transactionType",
-            his.create_time  as "createTime"
+            his.create_time  as "createTime",
+            his.auditiing_id as "auditiingId"
         FROM
             sys_user_account_history  his
             left join ins_area_company ins  on  his.suborder=ins.id
             left join  ins_orders o ON o.orderno=ins.orderno
         WHERE
             his.property !=1  and  his.property !=2
-          <if test="myIncomeAndExpensesQueryDto.incomeAndExpensesType !=null and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '' ">
+          <if test="myIncomeAndExpensesQueryDto.incomeAndExpensesType !=null and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '' and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '0' ">
             AND  his.documentary=#{ myIncomeAndExpensesQueryDto.incomeAndExpensesType}
           </if>
           and his.user_id = #{myIncomeAndExpensesQueryDto.userId}
           <if test="myIncomeAndExpensesQueryDto.startDate !=null and myIncomeAndExpensesQueryDto.startDate != '' and myIncomeAndExpensesQueryDto.endDate !=null and myIncomeAndExpensesQueryDto.endDate != '' ">
                 AND   his.create_time  BETWEEN #{myIncomeAndExpensesQueryDto.startDate} AND #{myIncomeAndExpensesQueryDto.endDate}
           </if>
-          <if test="myIncomeAndExpensesQueryDto.transactionType !=null and myIncomeAndExpensesQueryDto.transactionType != '' ">
+          <if test="myIncomeAndExpensesQueryDto.transactionType !=null and myIncomeAndExpensesQueryDto.transactionType != ''  and myIncomeAndExpensesQueryDto.transactionType != '0'">
             and his.property = #{myIncomeAndExpensesQueryDto.transactionType}
           </if>
-          <if test="myIncomeAndExpensesQueryDto.businessSegmentsType !=null and myIncomeAndExpensesQueryDto.businessSegmentsType != '' ">
+          <if test="myIncomeAndExpensesQueryDto.businessSegmentsType !=null and myIncomeAndExpensesQueryDto.businessSegmentsType != '' and myIncomeAndExpensesQueryDto.businessSegmentsType != '0'">
             and  his.business_eegments_type =#{myIncomeAndExpensesQueryDto.businessSegmentsType}
          </if>
         order by his.create_time desc
@@ -142,17 +143,17 @@
             sys_user_account_history  his
         WHERE
         his.property !=1  and  his.property !=2
-        <if test="myIncomeAndExpensesQueryDto.incomeAndExpensesType !=null and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '' ">
+        <if test="myIncomeAndExpensesQueryDto.incomeAndExpensesType !=null and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '' and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '0'">
             AND  his.documentary=#{ myIncomeAndExpensesQueryDto.incomeAndExpensesType}
         </if>
            and his.user_id = #{myIncomeAndExpensesQueryDto.userId}
         <if test="myIncomeAndExpensesQueryDto.startDate !=null and myIncomeAndExpensesQueryDto.startDate != '' and myIncomeAndExpensesQueryDto.endDate !=null and myIncomeAndExpensesQueryDto.endDate != '' ">
             AND   his.create_time  BETWEEN #{myIncomeAndExpensesQueryDto.startDate} AND #{myIncomeAndExpensesQueryDto.endDate}
         </if>
-        <if test="myIncomeAndExpensesQueryDto.transactionType !=null and myIncomeAndExpensesQueryDto.transactionType != '' ">
+        <if test="myIncomeAndExpensesQueryDto.transactionType !=null and myIncomeAndExpensesQueryDto.transactionType != ''  and myIncomeAndExpensesQueryDto.transactionType != '0'">
             and his.property = #{myIncomeAndExpensesQueryDto.transactionType}
         </if>
-        <if test="myIncomeAndExpensesQueryDto.businessSegmentsType !=null and myIncomeAndExpensesQueryDto.businessSegmentsType != '' ">
+        <if test="myIncomeAndExpensesQueryDto.businessSegmentsType !=null and myIncomeAndExpensesQueryDto.businessSegmentsType != '' and myIncomeAndExpensesQueryDto.businessSegmentsType != '0' ">
             and  his.business_eegments_type =#{myIncomeAndExpensesQueryDto.businessSegmentsType}
         </if>
     </select>
@@ -164,17 +165,17 @@
         sys_user_account_history  his
         WHERE
           his.property !=1  and  his.property !=2
-        <if test="myIncomeAndExpensesQueryDto.incomeAndExpensesType !=null and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '' ">
+        <if test="myIncomeAndExpensesQueryDto.incomeAndExpensesType !=null and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '' and myIncomeAndExpensesQueryDto.incomeAndExpensesType != '0' ">
             AND  his.documentary=#{ myIncomeAndExpensesQueryDto.incomeAndExpensesType}
         </if>
         and his.user_id = #{myIncomeAndExpensesQueryDto.userId}
         <if test="myIncomeAndExpensesQueryDto.startDate !=null and myIncomeAndExpensesQueryDto.startDate != '' and myIncomeAndExpensesQueryDto.endDate !=null and myIncomeAndExpensesQueryDto.endDate != '' ">
             AND   his.create_time  BETWEEN #{myIncomeAndExpensesQueryDto.startDate} AND #{myIncomeAndExpensesQueryDto.endDate}
         </if>
-        <if test="myIncomeAndExpensesQueryDto.transactionType !=null and myIncomeAndExpensesQueryDto.transactionType != '' ">
+        <if test="myIncomeAndExpensesQueryDto.transactionType !=null and myIncomeAndExpensesQueryDto.transactionType != '' and myIncomeAndExpensesQueryDto.transactionType != '0'">
             and his.property = #{myIncomeAndExpensesQueryDto.transactionType}
         </if>
-        <if test="myIncomeAndExpensesQueryDto.businessSegmentsType !=null and myIncomeAndExpensesQueryDto.businessSegmentsType != '' ">
+        <if test="myIncomeAndExpensesQueryDto.businessSegmentsType !=null and myIncomeAndExpensesQueryDto.businessSegmentsType != '' and myIncomeAndExpensesQueryDto.businessSegmentsType != '0' ">
             and  his.business_eegments_type =#{myIncomeAndExpensesQueryDto.businessSegmentsType}
         </if>
     </select>

src/main/resources/mapper/modules/ins/InsFeeOrderNewMapper.xml

@@ -560,7 +560,7 @@
         iac.signing_time as "signingTime",
         o.licenseno as "licenseno",
         a.first_detail_premiums as "amount",
-        iac.createtime as ".createTime"
+        iac.createtime as "createTime"
         FROM
         ins_fee_order_new a
         LEFT JOIN ins_area_company iac ON iac.id = a.ins_order_no
@@ -582,7 +582,7 @@
         iac.signing_time as "signingTime",
         o.licenseno as "licenseno",
         a.third_detail_premiums as "amount",
-        iac.createtime as ".createTime"
+        iac.createtime as "createTime"
         FROM
         ins_fee_order_new a
         LEFT JOIN ins_area_company iac ON iac.id = a.ins_order_no
@@ -604,7 +604,7 @@
         iac.signing_time as "signingTime",
         o.licenseno as "licenseno",
         a.second_detail_premiums as "amount",
-        iac.createtime as ".createTime"
+        iac.createtime as "createTime"
         FROM
         ins_fee_order_new a
         LEFT JOIN ins_area_company iac ON iac.id = a.ins_order_no
@@ -634,7 +634,7 @@
         as "amount",
         "1" as businessSegmentsType,
         "1" as  transactionType,
-        ins.createtime as ".createTime"
+        ins.createtime as "createTime"
         from
         ins_fee_order_new a  left join ins_area_company ins  on  a.ins_order_no=ins.id
         left join  ins_orders o ON o.orderno=ins.orderno
@@ -739,9 +739,6 @@
         FROM
         (
         SELECT
-        a.ins_order_no as "subOrderNo",
-        iac.signing_time as "signingTime",
-        o.licenseno as "licenseno",
         a.first_detail_premiums as "amount"
         FROM
         ins_fee_order_new a