查询订单账单明细排除之前的折扣商品订单

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

@@ -75,6 +75,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());
             List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto);
             PageInfo<DistributionOrder> pageInfo = new PageInfo<>(distributionOrderList);
             List<OrderBillVo> orderBillVoList = new ArrayList<>();

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

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

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

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