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

Mall.Module.Product/OrderModule.cs

@@ -4925,6 +4925,16 @@ namespace Mall.Module.Product
             var trans = goods_OrderCommissionRepository.DbTransaction;
             try
             {
+                #region 司导商品处理
+                if (demodel.OrderClassify == 1) {
+                    if (demodel.DetailList.Where(x => x.CarType != GuideCarGoodsTypeEnum.Line).Any()) {
+                        foreach (var item in demodel.DetailList.Where(x => x.CarType != GuideCarGoodsTypeEnum.Line)) {
+                            item.Number = 1;//司导的  除了线路  其他的都算包车
+                        }
+                    }
+                }
+                #endregion
+
                 var basicModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
                 if ((basicModel?.IsEnableFXGrade ?? 2) == 1)
                 {

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -681,6 +681,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.UpdateDate = DateTime.Now;
             demodel.UserId = userInfo.UserId;
             demodel.SmallShopsId = parms.GetInt("NewShopId");
+            demodel.OrderClassify = 0;
             #endregion
 
             return orderModule.SetAppletGoodsOrderInfo(demodel);