调整

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/AssObuSupplyManagerImpl.java

@@ -91,7 +91,6 @@ public class AssObuSupplyManagerImpl extends AbstractIawManager implements AssOb
 
 
         //更新订单状态
-
         LocalDateTime now = LocalDateTime.now();
         if (orderinfo.getArtificialStatus() == 1){
             orderinfo.setOrderStep(AssOrderStep.WAITING_AUDIT);

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/api/card/InvwCardDetailsController.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.invw.api.card;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.invw.api.MyValidController;

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/ats/OrderRefundQueryManagerImpl.java

@@ -76,7 +76,7 @@ public class OrderRefundQueryManagerImpl extends AbstractCommManager implements
         if (OrderPayType.HANDLE.equals(orderPay.getPayType()) ||
                 OrderPayType.MARGIN.equals(orderPay.getPayType()) ||
                 OrderPayType.PRESTORE.equals(orderPay.getPayType())) {
-            List<IssueOrderPay> issueOrderPays = orderPayRepo.listByOrderNo(orderPay.getOrderNo());
+            List<IssueOrderPay> issueOrderPays = orderPayRepo.listByOrderNo(orderPay.getOrderNo(), OrderType.ISSUE);
             if (!CollectionTools.isEmpty(issueOrderPays)) {
                 boolean allRefund = issueOrderPays.stream()
                         .allMatch(pay -> pay.getPayStatus() == OrderPayStatus.REFUND);