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

hai-order/src/main/java/com/web/controller/OrderController.java

@@ -308,6 +308,15 @@ public class OrderController {
                 goodsOrderModel.setGoodsOrder(order);
                 goodsOrderModel.setGoodsDeliveryAddress(deliveryAddress);
 
+
+
+                return ResponseMsgUtil.success(goodsOrderModel);
+
+            } else if (highOrder.getProductType() == 17) {
+
+                GoodsOrderModel goodsOrderModel = new GoodsOrderModel();
+                BeanUtils.copyProperties(highOrder , goodsOrderModel);
+
                 HighGroupOrder highGroupOrder = groupCodeService.findGroupOrder(highOrder.getOrderNo());
 
                 JSONObject object = groupService.getGroupContent(highGroupOrder.getGroupId());
@@ -321,7 +330,6 @@ public class OrderController {
 
                 HighGroupCode highGroupCode = groupCodeService.findGroupCode(map);
                 goodsOrderModel.setHighGroupCode(highGroupCode);
-
                 return ResponseMsgUtil.success(goodsOrderModel);
 
             }