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

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -571,7 +571,7 @@ where {where} group by g.Id order by {orderBy}";
             }
             if (!string.IsNullOrEmpty(dmodel.StoresIds))
             {
-                where += $@" and locate('{dmodel.StoresIds}',g.{nameof(RB_Goods_Extend.StoresIds)})";
+                where += $@" and locate(',{dmodel.StoresIds},', CONCAT(',',g.{nameof(RB_Goods_Extend.StoresIds)},',') )";
             }
             if (!string.IsNullOrEmpty(dmodel.Name))
             {
@@ -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.Repository/Reserve/RB_Reserve_ServicePersonalRepository.cs

@@ -137,12 +137,14 @@ LEFT JOIN (SELECT ServicePersonalId,COUNT(*) as CommentNum  from rb_goods_commen
                 {
                     builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
                 }
-
                 if (query.ServiceStatus > 0)
                 {
                     builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}");
                 }
-
+                if (query.StoreId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.StoreId)}={query.StoreId}");
+                }
             }
             return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList();
         }

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,
                     });
                 }
             }
@@ -396,6 +405,32 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", Robj);
         }
 
+
+        /// <summary>
+        /// 预定页面详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletOfflineGoodsInfo(object requestMsg)
+        {
+            var req = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            if (req.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            JObject prams = JObject.Parse(req.msg.ToString());
+            int GoodsId = prams.GetInt("GoodsId", 0);
+            int StoreId = prams.GetInt("StoreId", 0);
+            if (GoodsId <= 0|| StoreId<=0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            int UserId = req.UserId;
+
+            var Robj = productModule.GetAppletOfflineGoodsInfoModule(GoodsId, UserId, req.SmallShopsId, req.TenantId, req.MallBaseId, storeId: StoreId);
+            return ApiResult.Success("", Robj);
+        }
+
         /// <summary>
         /// 获取小程序商品详情备份
         /// </summary>

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);

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -704,10 +704,6 @@ namespace Mall.WebApi.Controllers.MallBase
             var req = RequestParm;
             var userInfo = AppletUserInfo;
             RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(req.msg.ToString());
-            if (string.IsNullOrEmpty(demodel.Consignee))
-            {
-                return ApiResult.ParamIsNull("请传递联系人");
-            }
             if (string.IsNullOrEmpty(demodel.Mobile))
             {
                 return ApiResult.ParamIsNull("请传递联系人手机号码");

Mall.WebApi/Controllers/Reserve/AppletStoresController.cs

@@ -135,8 +135,21 @@ namespace Mall.WebApi.Controllers.Reserve
             var storeModel = contentModule.GetStoresListModule(new RB_Stores_Extend()
             {
                 Id = storeId,
-                MallBaseId = parms.MallBaseId
+                MallBaseId = parms.MallBaseId,
+                CurrentPosition=position
             }, isFirst: true)?.FirstOrDefault();
+            string serviceTime = "";
+            if (storeModel != null)
+            {
+                if (storeModel.IsAllDay == 1)
+                {
+                    serviceTime = "全天";
+                }
+                else
+                {
+                    serviceTime = storeModel.StartTime + "-" + storeModel.EndTime;
+                }
+            }
             object result = new
             {
                 storeInfo = new
@@ -148,7 +161,15 @@ namespace Mall.WebApi.Controllers.Reserve
                     distance = storeModel?.KM,
                     storeScore = storeModel?.Score,
                     storeCoverImg = storeModel?.CoverImg,
-                    storeNavImg = storeModel?.NavImg
+                    storeNavImg = storeModel?.NavImg,
+                    storeIntro= storeModel?.Intro,
+                    storeProject= storeModel?.ServiceProject,
+                    storeServiceTime= serviceTime,
+                    consumptionObj = new
+                    {
+                        consumptionStoreId = 0,
+                        consumptionStoreName = "HK门店"
+                    }
                 },
             };
             return ApiResult.Success(data: result);

Mall.WebApi/Controllers/Reserve/OSGoodsController.cs

@@ -532,7 +532,7 @@ namespace Mall.WebApi.Controllers.Reserve
                     }
                     foreach (var item in MGradeList)
                     {
-                        var defaultModel = demodel.MemberPriceList.Where(x => x.MemberGrade == item.Id).FirstOrDefault();
+                        var defaultModel = demodel.MemberPriceList.Where(x => x.MemberGrade == item.Grade).FirstOrDefault();
                         if (defaultModel == null)
                         {
                             return ApiResult.ParamIsNull("会员价格" + item.Name + "不存在");