订单账单明细去除未付款订单

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

@@ -72,6 +72,8 @@ public class SysFinanceServiceImpl implements SysFinanceService {
     @Override
     public Result findOrderBillDetail(DistributionOrderRequestDto dto) {
         try {
+            dto.setFilterStateList(Arrays.asList(DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode(),
+                    DistributionEnum.DistributionOrderStateEnum.CANCEL.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

@@ -129,6 +129,11 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
      */
     private Integer state;
 
+    /**
+     * 查询时要排除的状态
+     */
+    private List<Integer> filterStateList;
+
     /**
      * 微信支付订单号
      */

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

@@ -115,6 +115,7 @@ public class DistributionOrderDaoImpl implements DistributionOrderDao {
         JdbcHelper.ifPresent(dto.getSellerId(), criteria::andSellerIdEqualTo);
         JdbcHelper.ifPresent(dto.getSellerIdList(), criteria::andSellerIdIn);
         JdbcHelper.ifPresent(dto.getState(), criteria::andStateEqualTo);
+        JdbcHelper.ifPresent(dto.getFilterStateList(), criteria::andStateNotIn);
         JdbcHelper.ifPresent(dto.getLogisticsState(), criteria::andLogisticsStateEqualTo);
         JdbcHelper.ifPresent(dto.getNotFilterLogisticsState(), criteria::andLogisticsStateNotEqualTo);
         JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/UserBillServiceImpl.java

@@ -107,4 +107,8 @@ public class UserBillServiceImpl implements UserBillService {
         }
     }
 
+
+    private void calculate() {
+
+    }
 }

ch-wx-api/src/test/java/com/wwdz/ch/wx/api/LogisticsApiTest.java

@@ -25,8 +25,8 @@ public class LogisticsApiTest {
     @Test
     public void findTrails() {
         LogisticsRequestDto dto = new LogisticsRequestDto();
-        dto.setLogisticsCode("YD");
-        dto.setWaybill("312421269717964");
+        dto.setLogisticsCode("EMS");
+        dto.setWaybill("9858779957787");
         Result result = logisticsApi.findTrails(dto);
         logger.info("物流轨迹: {}" + result);
     }

ch-wx-api/src/test/java/com/wwdz/ch/wx/api/WxPayServiceTest.java

@@ -89,12 +89,12 @@ public class WxPayServiceTest {
 
     @Test
     public void refund() {
-        List<String> list = Arrays.asList("DA2404301433196070258");
+        List<String> list = Arrays.asList("DA2407161343052675179");
         list.forEach(orderId ->{
             DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
             dto.setDistributionOrderId(orderId);
-            dto.setAmount("1");
-            dto.setRefundPrice("1");
+            dto.setAmount("10");
+            dto.setRefundPrice("10");
             Result result = wxPayServiceApi.refund(dto);
             logger.info("申请微信支付退款:{}", result);
         });