Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

Mall.Model/Entity/Product/RB_Goods_Order.cs

@@ -308,5 +308,9 @@ namespace Mall.Model.Entity.Product
         /// 微店id
         /// </summary>
         public int? SmallShopsId { get; set; }
+        /// <summary>
+        /// 订单分类  0正常订单  1司导订单
+        /// </summary>
+        public int OrderClassify { get; set; }
     }
 }

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -502,6 +502,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.UpdateDate = DateTime.Now;
             demodel.UserId = userInfo.UserId;
             demodel.SmallShopsId = req.SmallShopsId;
+            demodel.OrderClassify = 0;
             #endregion
 
             return orderModule.SetAppletGoodsOrderInfo(demodel);
@@ -582,6 +583,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.UpdateDate = DateTime.Now;
             demodel.UserId = userInfo.UserId;
             demodel.SmallShopsId = req.SmallShopsId;
+            demodel.OrderClassify = 1;
             #endregion
 
             return orderModule.SetAppletSDGoodsOrderInfo(demodel);

Mall.WebApi/Controllers/Product/GuideCarController.cs

@@ -789,8 +789,6 @@ namespace Mall.WebApi.Controllers.MallBase
         }
         #endregion
 
-
-
         #region 站点配置
         /// <summary>
         /// 列表