Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

hai-service/src/main/java/com/hai/openApi/service/impl/ApiOrderServiceImpl.java

@@ -281,6 +281,8 @@ public class ApiOrderServiceImpl implements ApiOrderService {
             createOrderChildModel.setIsTyAgent(false);
             createOrderChildModel.setGoodsPrice(apiOrder.getOrderPrice());
             createOrderChildModel.setPrice(apiOrder.getCostPrice());
+            createOrderModel.setMemName("接口用户");
+            createOrderModel.setMemPhone(dataObject.getString("userMobile"));
 
             // 组装订单
             createOrderModel.getChildOrderList().add(createOrderChildModel);

hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java

@@ -377,12 +377,6 @@ public class OrderServiceImpl implements OrderService {
                 order.setProductType(OrderProductType.PRODUCT_TYPE17.getNumber());
                 order.setSecUserId(childOrder.getId());
                 order.setTitle("团购套餐");
-            } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE17.getNumber())) {
-                HighChildOrder childOrder = orderCreateHandleService.group(order , child);
-                childOrderList.add(childOrder);
-                order.setProductType(OrderProductType.PRODUCT_TYPE17.getNumber());
-                order.setSecUserId(childOrder.getId());
-                order.setTitle("团购套餐");
             } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE18.getNumber())) {
                 HighChildOrder childOrder = orderCreateHandleService.petroCoupon(order , child);
                 childOrderList.add(childOrder);