后台财务管理

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysFinanceServiceImpl.java

@@ -22,6 +22,7 @@ import com.wwdz.ch.core.util.*;
 import com.wwdz.ch.db.dao.distribution.*;
 import com.wwdz.ch.db.domain.distribution.*;
 import com.wwdz.ch.db.dto.request.distribution.*;
+import com.xxdxxs.db.component.JdbcHelper;
 import com.xxdxxs.utils.CommonUtils;
 import com.xxdxxs.utils.EntityMapper;
 import org.slf4j.Logger;
@@ -75,7 +76,7 @@ public class SysFinanceServiceImpl implements SysFinanceService {
         try {
             dto.setFilterStateList(Arrays.asList(DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode(),
                     DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()));
-            dto.setFilterType(DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode());
+            dto.setFilterTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode(), DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()));
             List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto);
             PageInfo<DistributionOrder> pageInfo = new PageInfo<>(distributionOrderList);
             List<OrderBillVo> orderBillVoList = new ArrayList<>();
@@ -287,6 +288,7 @@ public class SysFinanceServiceImpl implements SysFinanceService {
                 distributionOrderRequestDto.setEndCreateTime(dto.getEndCreateTime());
                 distributionOrderRequestDto.setDistributionOrderId(dto.getTransactionId());
                 distributionOrderRequestDto.setState(dto.getOrderState());
+                distributionOrderRequestDto.setFilterTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode(), DistributionEnum.DistributionTypeEnum.EXCHANGE.getCode()));
                 //订单量变大后再加上分页，但是实际分页会有出入，目前订单表查出全量数据，再进行筛选
                /* distributionOrderRequestDto.setPage(dto.getPage());*/
                 distributionOrderRequestDto.setLimit(10000);

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributionOrderRequestDto.java

@@ -231,6 +231,8 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
 
     private Integer filterType;
 
+    private List<Integer> filterTypeList;
+
     /**
      * 退回收货人名称
      */

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/DistributionOrderDaoImpl.java

@@ -122,6 +122,7 @@ public class DistributionOrderDaoImpl implements DistributionOrderDao {
         JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
         JdbcHelper.ifPresent(dto.getTypeList(), criteria::andTypeIn);
         JdbcHelper.ifPresent(dto.getFilterType(), criteria::andTypeNotEqualTo);
+        JdbcHelper.ifPresent(dto.getFilterTypeList(), criteria::andTypeNotIn);
         JdbcHelper.ifPresent(dto.getStartCreateTime(), criteria::andCreateTimeGreaterThanOrEqualTo);
         JdbcHelper.ifPresent(dto.getEndCreateTime(), criteria::andCreateTimeLessThanOrEqualTo);
         JdbcHelper.ifPresent(dto.getStartDeliveryTime(), criteria::andDeliveryTimeGreaterThanOrEqualTo);