页面修改

Mall.Module.Product/ProductModule.cs

@@ -242,10 +242,11 @@ namespace Mall.Module.Product
         /// <param name="count"></param>
         /// <param name="demodel"></param>
         /// <param name="IsGetShare">1-获取分销佣金</param>
+        /// <param name="GoodsClassify">商品类型</param>
         /// <returns></returns>
-        public List<RB_Goods_Extend> GetAppletGoodsPageListForZY(int pageIndex, int pageSize, out long count, RB_Goods_Extend demodel, int IsGetShare = 0)
+        public List<RB_Goods_Extend> GetAppletGoodsPageListForZY(int pageIndex, int pageSize, out long count, RB_Goods_Extend demodel, int IsGetShare = 0, int GoodsClassify = 0)
         {
-            var list = goodsRepository.GetAppletGoodsPageList(pageIndex, pageSize, out count, demodel);
+            var list = goodsRepository.GetAppletGoodsPageList(pageIndex, pageSize, out count, demodel,GoodsClassify:GoodsClassify);
             if (list.Any())
             {
                 var SpecificationList = new List<RB_Goods_Specification_Extend>();

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -798,6 +798,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
         /// <param name="pageSize"></param>
         /// <param name="count"></param>
         /// <param name="dmodel"></param>
+        /// <param name="GoodsClassify">商品类型</param>
         /// <returns></returns>
         public List<RB_Goods_Extend> GetAppletGoodsPageList(int pageIndex, int pageSize, out long count, RB_Goods_Extend dmodel, int GoodsClassify = 0)
         {
@@ -872,6 +873,11 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
                     where += $@" and g.{nameof(RB_Goods_Extend.GoodsPageType)} in(0,2)";
                 }
             }
+            //HK 新加参数
+            if (!string.IsNullOrEmpty(dmodel.StoresIds))
+            {
+                where += $@" AND locate(',{dmodel.StoresIds},',CONCAT(',',g.{nameof(RB_Goods_Extend.StoresIds)}, ','))";
+            }
             //默认综合【升序】
             string orderBy = $" order by g.{nameof(RB_Goods_Extend.Sort)} asc";
             //上架时间【降序】

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -184,6 +184,13 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 demodel.SmallShopsId = newParms.GetInt("ERPSmallShopId");
             }
+            int GoodsClassify = 0;
+            //HK 2020-10-30新增
+            if (newParms.GetInt("StoreId") > 0)
+            {
+                demodel.StoresIds = newParms.GetInt("StoreId").ToString();
+                GoodsClassify = 3;
+            }
             demodel.UserId = UserId;
             //HK2020-09-07新增
             int IsGetShare = newParms.GetInt("IsGetShare");
@@ -200,7 +207,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     demodel.SmallShopsId = userModel.SmallShopId;
                 }
             }
-            var list = productModule.GetAppletGoodsPageListForZY(pagelist.pageIndex, pagelist.pageSize, out long count, demodel,IsGetShare:IsGetShare);
+            var list = productModule.GetAppletGoodsPageListForZY(pagelist.pageIndex, pagelist.pageSize, out long count, demodel,IsGetShare:IsGetShare,GoodsClassify: GoodsClassify);
             List<object> RList = new List<object>();
             if (list.Any())
             {
@@ -362,7 +369,9 @@ namespace Mall.WebApi.Controllers.MallBase
                         goods_num = model.InventoryNum,
                         marketingLogo= model.MarketingLogo,
                         video_type=model.VideoType,
-                        erpgoodobj=model.ERPGoodObj
+                        erpgoodobj=model.ERPGoodObj,
+                        isChooseServicePerson= model.IsChooseServicePerson,
+                        depositMoney= model.DepositMoney,
                     });
                 }
             }

Mall.WebApi/Controllers/Product/AppletGuideCarController.cs

@@ -115,24 +115,14 @@ namespace Mall.WebApi.Controllers.Product
                 return ApiResult.Failed("请选择还车时间");
             }
 
-            //if (demodel.RegionId == 0)
-            //{
-            //    return ApiResult.Failed("请选择区信息");
-            //}
-            //else
-            //{
-
-            //}
-
-
-
             DateTime tempStartTime = Convert.ToDateTime(demodel.StartTime);
             DateTime tempEndTime = Convert.ToDateTime(demodel.EndTime);
             if (demodel.CarType.HasValue && (demodel.CarType == Common.Enum.Goods.GuideCarGoodsTypeEnum.JJ || demodel.CarType == Common.Enum.Goods.GuideCarGoodsTypeEnum.SJ))
             {
                 demodel.UseDay = 1;
             }
-            else {
+            else
+            {
                 if (tempStartTime.ToString("yyyy-MM-dd") == tempEndTime.ToString("yyyy-MM-dd"))//判断使用天数是否是0.5天/1天
                 {
                     TimeSpan sp = tempEndTime.Subtract(tempStartTime);