Merge branch 'feature/0710-mall' into online

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/dto/OrderCreate.java

@@ -44,12 +44,24 @@ public class OrderCreate {
     @ApiModelProperty(value = "区")
     private String receiverRegion;
 
+
+    @ApiModelProperty(value = "订单来源 JMEDU: 管乐团 COOLESHOW_EDU:课堂乐器")
+    private String platformType = "JMEDU";
+
     @ApiModelProperty(value = "详细地址")
     private String receiverDetailAddress;
 
     @ApiModelProperty("商品详情")
     private List<OrderItem> orderItemList;
 
+    public String getPlatformType() {
+        return platformType;
+    }
+
+    public void setPlatformType(String platformType) {
+        this.platformType = platformType;
+    }
+
     public static class OrderItem implements Serializable {
 
 

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -951,7 +951,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
         detail = new OmsOrder();
         detail.setMemberId(umsMember.getId());
-        detail.setPlatformType("JMEDU");
+        detail.setPlatformType(order.getPlatformType());
         detail.setOrderSn(order.getOrderNo());
         detail.setCreateTime(new Date());
         detail.setMemberUsername(umsMember.getUsername());