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

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -363,5 +363,10 @@ namespace Mall.Model.Extend.Product
         /// 订单商品所属门店
         /// </summary>
         public int StoresIds { get; set; }
+
+        /// <summary>
+        /// 服务人员头像
+        /// </summary>
+        public string ServicepersonalHead { get; set; }
     }
 }

Mall.Module.Product/OrderModule.cs

@@ -13770,7 +13770,9 @@ namespace Mall.Module.Product
                 }
                 if (item.ServicepersonalId > 0)
                 {
-                    item.ServicepersonalName = persionList?.Where(qitem => qitem.ID == item.ServicepersonalId)?.FirstOrDefault()?.Name ?? "";
+                    var personModel = persionList?.Where(qitem => qitem.ID == item.ServicepersonalId)?.FirstOrDefault();
+                    item.ServicepersonalName = personModel?.Name ?? "";
+                    item.ServicepersonalHead = personModel?.ServiceLogo ?? "";
                 }
             }
             return list;

Mall.Module.Reserve/OfflineGoodsModule.cs

@@ -1319,7 +1319,7 @@ namespace Mall.Module.Product
                     {
                         var carScoreList = goods_CommentRepository.GetAppletReserveGoodsCommentscore(dmodel.GoodsId.Value, 0, dmodel.TenantId, dmodel.MallBaseId);
                         decimal carScore = 0;
-                        if (carScoreList != null && carScoreList.Any())
+                        if (carScoreList != null && carScoreList.Any() && carScoreList.FirstOrDefault().CommentNum>0)
                         {
                             carScore = carScoreList.FirstOrDefault().TotalScore / carScoreList.FirstOrDefault().CommentNum;
                         }
@@ -1347,7 +1347,7 @@ namespace Mall.Module.Product
                     {
                         decimal guidScore = 0;
                         var guideScoreList = goods_CommentRepository.GetAppletReserveGoodsCommentscore(0, dmodel.ServicepersonalId.Value, dmodel.TenantId, dmodel.MallBaseId);
-                        if (guideScoreList != null && guideScoreList.Any())
+                        if (guideScoreList != null && guideScoreList.Any()&& guideScoreList.FirstOrDefault().CommentNum>0)
                         {
                             guidScore = guideScoreList.FirstOrDefault().TotalScore / guideScoreList.FirstOrDefault().CommentNum;
                         }

Mall.Repository/Product/RB_Goods_OrderDetailRepository.cs

@@ -653,7 +653,7 @@ where {where}  order by o.CreateDate desc";
             string sql = $@"
 SELECT a.*,e.`Name` as CarName,e.CarType as GuideCarType,e.CarClass,f.ColorName as CarColorName,cb.`Name` as CarBrandName,g.RideNum
       ,gcg.Name as GuideName,gcg.GuidePhoto,gcg.WorkYears as GuideWorkYears,gcg.Score as GuideScore,gcg.Telephone as GuideTelephone
-      ,g.StoresIds
+      ,o.StoresId AS StoresIds
 FROM rb_goods_orderdetail as a 
 left join rb_goods_order o on a.OrderId = o.OrderId
 LEFT JOIN rb_guidecar_car as e on e.ID=a.CarId

Mall.WebApi/Controllers/BaseController.cs

@@ -74,7 +74,8 @@ namespace Mall.WebApi.Controllers
         {
             get {
                 var parm = this.RequestParm;
-                AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid);
+                //AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid);
+                AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(106259);
                 return userInfo;
             }
         }

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -1289,6 +1289,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.ServicepersonalId,
                 x.ServicepersonalName,
                 x.StoresIds,
+                x.ServicepersonalHead,
             });
             return ApiResult.Success("", pagelist);
         }