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

Mall.Module.Product/OrderModule.cs

@@ -962,10 +962,10 @@ namespace Mall.Module.Product
                 string orderDetailIds = string.Join(",", dlist.Select(x => x.Id));
                 var oasList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetailIds = orderDetailIds, TenantId = tenantId, MallBaseId = mallBaseId }, false);
                 string servicePersions = string.Join(",", dlist.Select(x => x.ServicepersonalId));
-               var serviceList=  reserve_ServicePersonalRepository.GetServicePersonalList(new Model.Extend.Reserve.RB_Reserve_ServicePersonal_Extend()
+                var serviceList = reserve_ServicePersonalRepository.GetServicePersonalList(new Model.Extend.Reserve.RB_Reserve_ServicePersonal_Extend()
                 {
                     QIds = servicePersions
-               });
+                });
                 foreach (var item in dlist)
                 {
                     item.CoverImagePath = item.CoverImage;
@@ -5879,6 +5879,21 @@ namespace Mall.Module.Product
             }
         }
 
+        /// <summary>
+        /// 修改订单线下服务人员
+        /// </summary>
+        /// <param name="OrderId"></param>
+        /// <param name="ServicepersonalId"></param>
+        /// <returns></returns>
+        public bool SetOfflineOrderServicepersionModule(int OrderId, int ServicepersonalId)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Goods_OrderDetail_Extend.ServicepersonalId),ServicepersonalId }
+            };
+            return goods_OrderDetailRepository.Update(fileds, new WhereHelper(nameof(RB_Goods_OrderDetail_Extend.GoodsId), OrderId));
+        }
+
         /// <summary>
         /// 赠送粉象等级
         /// </summary>
@@ -12603,6 +12618,11 @@ namespace Mall.Module.Product
             {
                 return ApiResult.Failed("订单信息不存在，请核实后再试");
             }
+            var storeModel = new RB_Stores();
+            if (model.StoresId > 0)
+            {
+                storeModel = storesRepository.GetEntity(model.StoresId);
+            }
 
             //查询订单所属微店  2020-08-14 Add By:W
             if (model.SmallShopsId.HasValue && model.SmallShopsId > 0)
@@ -12613,8 +12633,6 @@ namespace Mall.Module.Product
                     model.SmallShopsName = smallShop.Name;
                 }
             }
-
-
             // 2020-08-14 Add By:W End
 
             //查询订单明细
@@ -12624,10 +12642,16 @@ namespace Mall.Module.Product
             List<RB_Material_Info_Extend> Mlist = new List<RB_Material_Info_Extend>();
             if (dlist.Any())
             {
+                string servicePersions = string.Join(",", dlist.Select(x => x.ServicepersonalId));
+                var serviceList = reserve_ServicePersonalRepository.GetServicePersonalList(new Model.Extend.Reserve.RB_Reserve_ServicePersonal_Extend()
+                {
+                    QIds = servicePersions
+                });
                 foreach (var item in dlist)
                 {
                     item.CoverImagePath = item.CoverImage;
                     item.IsBindExpress = erList.Where(x => x.OrderDetailId == item.Id).Any() ? 1 : 2;
+                    item.ServicepersonalName = serviceList?.Where(qitem => qitem.ID == item.ServicepersonalId)?.FirstOrDefault()?.Name ?? "";
                 }
             }
             model.DetailList = dlist;
@@ -12816,7 +12840,8 @@ namespace Mall.Module.Product
                     model.District,
                     model.SmallShopsName,
                     model.SmallShopsId,
-
+                    storeName = storeModel?.Name ?? "",
+                    storeAddress = storeModel?.Address ?? "",
                     OrderExpressList = oeList.Select(x => new
                     {
                         x.Id,
@@ -12883,7 +12908,10 @@ namespace Mall.Module.Product
                     InsuranceMoney = x.InsuranceMoney ?? 0,
                     IntegralMoney = x.IntegralMoney ?? 0,
                     IntegralNumber = x.IntegralNumber ?? 0,
-                })
+                    x.ServiceTime,
+                    x.ServiceDate,
+                    x.ServicepersonalName,
+                }),
             });
         }
 

Mall.Module.Product/ProductModule.cs

@@ -3765,6 +3765,41 @@ namespace Mall.Module.Product
             #endregion
         }
 
+        /// <summary>
+        /// 获取线下服务人员列表
+        /// </summary>
+        /// <param name="goodsId"></param>
+        /// <param name="UserId"></param>
+        /// <param name="SmallShopsId"></param>
+        /// <param name="TenantId"></param>
+        /// <param name="MallBaseId"></param>
+        /// <param name="storeId"></param>
+        /// <returns></returns>
+        public object GetAppletOfflineServicePersionModule(int goodsId, int UserId, int SmallShopsId, int TenantId, int MallBaseId, int storeId = 0)
+        {
+            var model = goodsRepository.GetEntity(goodsId).RefMapperTo<RB_Goods_Extend>();
+            //查询分类
+            model.CategoryList = goods_CategoryRepository.GetList(new RB_Goods_Category_Extend() { GoodsId = goodsId, TenantId = TenantId, MallBaseId = MallBaseId });
+
+            string categoryIds = "0";
+            if (model.CategoryList != null && model.CategoryList.Count > 0)
+            {
+                categoryIds = string.Join(",", model.CategoryList.Select(qitem => qitem.CategoryId));
+            }
+            var servicePersionList = reserve_ServicePersonalRepository.GetServicePersonalListExtRepository(storeId, model.Id, categoryIds)?.ToList() ?? new List<Model.Extend.Reserve.RB_Reserve_ServicePersonal_Extend>();
+            return servicePersionList?.Where(qitem => qitem.ServiceStatus == 1).Select(qitem => new
+            {
+                qitem.ServiceLogo,
+                qitem.Score,
+                qitem.Name,
+                qitem.Major,
+                Gender = qitem.Gender.ToInt(),
+                ReserveCount = qitem.OrderNum,
+                ServiceId = qitem.ID
+            });
+        }
+
+
         /// <summary>
         /// 获取小程序商品视频分页列表
         /// </summary>

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -1378,12 +1378,14 @@ GROUP BY od.GoodsId,o.OrderId
         public List<OrderStatistics_Query> GetFXOrderProfitLossList(int pageIndex, int pageSize, out long count, OrderStatistics_Query dmodel)
         {
             // string where = "where 1=1 and a.OrderStatus in(2,3,4,5,6) ";
+            DynamicParameters parameters = new DynamicParameters();
             string where = "where 1=1 and (a.OrderStatus in(2,3,4,5,6) or (a.OrderStatus=7 and a.PaymentTime is not NULL and a.CancelTime is not NULL and DATE_FORMAT(a.PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(a.CancelTime,'%Y-%m-%d' ) ) ) ";
             if (dmodel != null)
             {
                 if (!string.IsNullOrWhiteSpace(dmodel.OrderNo))
                 {
-                    where += $" and  a.OrderNo like'%{dmodel.OrderNo}%'";
+                    where += $" and  a.OrderNo like @OrderNo ";
+                    parameters.Add("OrderNo", "%" + dmodel.OrderNo.Trim() + "%");
                 }
                 if (dmodel.TenantId > 0)
                 {
@@ -1446,7 +1448,7 @@ LEFT JOIN rb_member_user as muser on muser.id=b.CompanyId
 left join rb_goods_orderaftersale oa on b.ID= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5) {where}
 GROUP BY b.Id order by b.Id asc";
 
-            return GetPage<OrderStatistics_Query>(pageIndex, pageSize, out count, sql).ToList();
+            return GetPage<OrderStatistics_Query>(pageIndex, pageSize, out count, sql, parameters).ToList();
         }
 
 

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -373,6 +373,7 @@ namespace Mall.WebApi.Controllers.MallBase
                         erpgoodobj=model.ERPGoodObj,
                         isChooseServicePerson= model.IsChooseServicePerson,
                         depositMoney= model.DepositMoney,
+                        goodsclassify= model.GoodsClassify
                     });
                 }
             }
@@ -432,6 +433,30 @@ namespace Mall.WebApi.Controllers.MallBase
             return ApiResult.Success("", Robj);
         }
 
+        /// <summary>
+        /// 获取门店服务人员
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletOfflineServicePersion(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 (StoreId <= 0 || GoodsId <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "请选择门店");
+            }
+            int UserId = req.UserId;
+            object Robj = productModule.GetAppletOfflineServicePersionModule(GoodsId, UserId, req.SmallShopsId, req.TenantId, req.MallBaseId, storeId: StoreId);
+            return ApiResult.Success("", Robj);
+        }
+
         /// <summary>
         /// 预定页面获取商品分类列表
         /// </summary>

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -748,6 +748,22 @@ namespace Mall.WebApi.Controllers.MallBase
             return flag ? ApiResult.Success(message: message,data: new { demodel.OrderId }) : ApiResult.Failed(message: message);
         }
 
+        /// <summary>
+        /// 线下服务下单
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetOfflineOrderServicepersion()
+        {
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int OrderId = parms.GetInt("OrderId");
+            int ServicepersonalId = parms.GetInt("ServicepersonalId");
+            bool flag = orderModule.SetOfflineOrderServicepersionModule(OrderId, ServicepersonalId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         /// <summary>
         /// ERP下单
         /// </summary>

Mall.WebApi/Controllers/Reserve/OSGoodsController.cs

@@ -83,8 +83,6 @@ namespace Mall.WebApi.Controllers.Reserve
             return ApiResult.Success("", pagelist);
         }
 
-
-
         /// <summary>
         /// 商品导出
         /// </summary>