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

Mall.Model/Extend/Product/RB_Goods_Extend.cs

@@ -230,5 +230,10 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public List<object> SupplierSpecificationList { get; set; }
 
+        /// <summary>
+        /// 是否直查询有视频商品(1-是)HK0902新增
+        /// </summary>
+        public int IsVideo { get; set; }
+
     }
 }

Mall.Model/Extend/Product/RB_ImageCommonModel.cs

@@ -24,5 +24,10 @@ namespace Mall.Model.Extend.Product
         /// 路径
         /// </summary>
         public string Path { get; set; }
+
+        /// <summary>
+        /// 1-视频
+        /// </summary>
+        public int Type { get; set; }
     }
 }

Mall.Module.Product/OrderModule.cs

@@ -6956,14 +6956,14 @@ namespace Mall.Module.Product
             if (model.Type == 2)
             {
                 var oeModel = goods_OrderExpressRepository.GetList(new RB_Goods_OrderExpress_Extend() { AfterSaleOrderId = model.ReOrderId, TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
-                if (oeModel.Type == 1)
+                if (oeModel!=null&&oeModel.Type == 1)
                 {
                     var leModel = logistics_ExpressRepository.GetEntity(oeModel.ExpressId);
                     ExpressList.Add(new
                     {
                         Name = uModel.Name ?? "",
                         ExpressName = leModel.Name ?? "",
-                        oeModel.ExpressNumber,
+                        ExpressNumber=oeModel?.ExpressNumber??"",
                         Type = 1
                     });
                 }
@@ -6973,7 +6973,7 @@ namespace Mall.Module.Product
                     {
                         Name = uModel.Name ?? "",
                         ExpressName = "",
-                        ExpressNumber = oeModel.Remark,
+                        ExpressNumber = oeModel?.Remark??"",
                         Type = 2
                     });
                 }

Mall.Module.User/EmployeeModule.cs

@@ -233,7 +233,7 @@ namespace Mall.Module.User
             {
                 { nameof(RB_Employee_Extend.Status),1},
             };
-            bool flag = roleRepository.Update(fileds, new WhereHelper(nameof(RB_Employee_Extend.EmpId), EmpId));
+            bool flag = employeeRepository.Update(fileds, new WhereHelper(nameof(RB_Employee_Extend.EmpId), EmpId));
             return flag;
         }
 

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -411,6 +411,11 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.CreateDate)} <='{dmodel.EndTime + " 23:59:59"}'";
             }
+            if (dmodel.IsVideo > 0)
+            {
+                where += $@" and IFNULL(g.{nameof(RB_Goods_Extend.VideoAddress)} <>'' ";
+            }
+
             //默认综合【升序】
             string orderBy = $" order by g.{nameof(RB_Goods_Extend.Sort)} asc";
             //上架时间【降序】

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -88,9 +88,13 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull("请传递文件路径");
             }
-
+            //HK2020-09-01修改
+            if (demodel.Type == 1)
+            {
                 demodel.Path = Config.GetFilePath(demodel.Path);
                 demodel.Image = Config.GetFilePath(demodel.Image);
+            }        
+            
             demodel.TenantId = Convert.ToInt32(parms.uid);
             demodel.MallBaseId = parms.MallBaseId;
             demodel.CreateDate = DateTime.Now;
@@ -1447,7 +1451,10 @@ namespace Mall.WebApi.Controllers.MallBase
             }
 
             var model = productModule.GetProductGoodsInfo(GoodsId, req.TenantId, req.MallBaseId);
-            return ApiResult.Success("", new
+            object obj = new object();
+            if (model != null)
+            {
+                obj = new
                 {
                     model?.Id,
                     model?.Name,
@@ -1500,7 +1507,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     model?.IsProcurement,
                     model?.Commission,
                     model?.IsLiveGoods,
-                model.SendArea,
+                    model?.SendArea,
                     CategoryList = model?.CategoryList.Select(x => new
                     {
                         x.Id,
@@ -1590,7 +1597,9 @@ namespace Mall.WebApi.Controllers.MallBase
                     model?.MarketingLogo,
                     model?.ShelvesDate,
                     model?.DownDate,
-            });
+                };
+            }
+            return ApiResult.Success("", obj);
         }
 
         /// <summary>