bug fixes

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

@@ -95,15 +95,6 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 List<Integer> ids = new ArrayList<>();
                 for (NewShopOrder newShopOrder : newShopOrders) {
                     ids.add(newShopOrder.getShopOrderID());
-                    NewOrder order = newOrderDao.findByOrderID(newShopOrder.getOrderID());
-                    if ("2".equals(order.getOrderType())) {
-                        //呵呵商城订单
-                        newShopOrder.setOrderType(2);
-                        if (StringUtils.isBlank(newShopOrder.getClubName())) {
-                            String name = heHeNewOrderDao.findHeUser(order.getUserID());
-                            newShopOrder.setClubName(name);
-                        }
-                    }
                 }
                 List<Integer> id = cmPayShopDao.hasReapply(payShop.getId(), ids);
                 if (id.isEmpty()) {
@@ -114,9 +105,19 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                     payShop.setRePayment("2");
                 }
             }
+            newShopOrders.forEach(shopOrder -> {
+                NewOrder order = newOrderDao.findByOrderID(shopOrder.getOrderID());
+                if ("2".equals(order.getOrderType())) {
+                    //呵呵商城订单
+                    shopOrder.setOrderType(2);
+                    if (StringUtils.isBlank(shopOrder.getClubName())) {
+                        String name = heHeNewOrderDao.findHeUser(order.getUserID());
+                        shopOrder.setClubName(name);
+                    }
+                }
+            });
         }
-        Page<CmPayShop> cmPayShopPage = page1.setList(list);
-        return cmPayShopPage;
+        return page1.setList(list);
     }
 
     @Transactional(readOnly = false)