bugfix

src/main/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -275,9 +275,9 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
         return page;
     }
 
-    public void setValue(List<NewShopOrder> payOrderList){
+    public void setValue(List<NewShopOrder> payOrderList) {
         for (NewShopOrder so : payOrderList) {
-            Integer onlineFlag=newOrderDao.findOnlinePay(so.getOrderID())>0?1:0;
+            Integer onlineFlag = newOrderDao.findOnlinePay(so.getOrderID()) > 0 ? 1 : 0;
             so.setOnlineFlag(onlineFlag);
             //统计该子订单的主的收款金额和收款状态
             NewOrder newOrder = newOrderDao.get(so.getOrderID().toString());
@@ -434,9 +434,6 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
 
     public Page<NewOrder> findPaymentOrderList(Page<NewOrder> page, NewOrder newOrder) {
         newOrder.setPage(page);
-        List<SettleRecord> settleRecord = newOrderDao.findSettleRecord(newOrder.getOrderID());
-        Integer num=null==settleRecord?0:settleRecord.size();
-        newOrder.setSettleRecordNum(num);
         if (newOrder.getPayStatus() != null && newOrder.getPayStatus() != "") {
             String[] split = newOrder.getPayStatus().split(",");
             newOrder.setPs(split);
@@ -451,7 +448,10 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             orderIds = cmDiscernReceiptDao.findRebateOrderID(orderList.stream().map(NewOrder::getOrderID).collect(Collectors.toList()));
         }
         for (NewOrder order : orderList) {
-            if("0".equals(order.getOnlinePayFlag())){
+            List<SettleRecord> settleRecord = newOrderDao.findSettleRecord(order.getOrderID());
+            Integer num = null == settleRecord ? 0 : settleRecord.size();
+            order.setSettleRecordNum(num);
+            if ("0".equals(order.getOnlinePayFlag())) {
                 order.setSettleAmount(newOrderDao.findSettleAmount(order.getOrderID()));
             }
             if (orderIds != null && orderIds.contains(order.getOrderID())) {
@@ -694,7 +694,7 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
         return newShopOrderDao.findSettleRecord(shopOrderID);
     }
 
-    public List<Integer> payWay(Integer shoprderID){
+    public List<Integer> payWay(Integer shoprderID) {
         return newShopOrderDao.payWay(shoprderID);
     }
 }