提交代码

Mall.Module.Product/GuideCarModule.cs

@@ -2894,6 +2894,17 @@ namespace Mall.Module.Product
             return flag;
         }
 
+
+        /// <summary>
+        /// 获取站点地区列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_GuideCar_SiteRegion_Extend> GetListRepository(RB_GuideCar_SiteRegion_Extend query)
+        {
+            return SiteRegionRepository.GetListRepository(query);
+        }
+
         #endregion
 
         #region 导游信息
@@ -3482,7 +3493,8 @@ namespace Mall.Module.Product
                         decimal carScore = 0;
                         if (carScoreList != null && carScoreList.Any())
                         {
-                            carScore = (carScoreList.FirstOrDefault().TotalScore + (Convert.ToDecimal(list.Where(x => x.CarId == dmodel.CarId).FirstOrDefault().CommentScore ?? 0))) / (carScoreList.FirstOrDefault().CommentNum + 1);
+                            carScore = carScoreList.FirstOrDefault().TotalScore / carScoreList.FirstOrDefault().CommentNum;
+                            //carScore = (carScoreList.FirstOrDefault().TotalScore + (Convert.ToDecimal(list.Where(x => x.CarId == dmodel.CarId).FirstOrDefault().CommentScore ?? 0))) / (carScoreList.FirstOrDefault().CommentNum + 1);
                         }
                         else
                         {
@@ -3510,7 +3522,8 @@ namespace Mall.Module.Product
                         var guideScoreList = goods_CommentRepository.GetAppletGoodsCommentscore(0, dmodel.GuideId.Value, dmodel.TenantId, dmodel.MallBaseId);
                         if (guideScoreList != null && guideScoreList.Any())
                         {
-                            guidScore = (guideScoreList.FirstOrDefault().TotalScore + (Convert.ToDecimal(list.Where(x => x.GuideId == dmodel.GuideId).FirstOrDefault().CommentScore ?? 0))) / (guideScoreList.FirstOrDefault().CommentNum + 1);
+                            guidScore = guideScoreList.FirstOrDefault().TotalScore / guideScoreList.FirstOrDefault().CommentNum;
+                            //guidScore = (guideScoreList.FirstOrDefault().TotalScore + (Convert.ToDecimal(list.Where(x => x.GuideId == dmodel.GuideId).FirstOrDefault().CommentScore ?? 0))) / (guideScoreList.FirstOrDefault().CommentNum + 1);
                         }
                         else
                         {
@@ -3564,7 +3577,7 @@ namespace Mall.Module.Product
                         decimal carScore = 0;
                         if (carScoreList != null && carScoreList.Any())
                         {
-                            carScore = (carScoreList.FirstOrDefault().TotalScore + (Convert.ToDecimal(list.Where(x => x.CarId == dmodel.CarId).FirstOrDefault().CommentScore ?? 0))) / (carScoreList.FirstOrDefault().CommentNum + 1);
+                            carScore = carScoreList.FirstOrDefault().TotalScore / carScoreList.FirstOrDefault().CommentNum;
                         }
                         else
                         {
@@ -3592,7 +3605,7 @@ namespace Mall.Module.Product
                         var guideScoreList = goods_CommentRepository.GetAppletGoodsCommentscore(0, dmodel.GuideId.Value, dmodel.TenantId, dmodel.MallBaseId);
                         if (guideScoreList != null && guideScoreList.Any())
                         {
-                            guidScore = (guideScoreList.FirstOrDefault().TotalScore + (Convert.ToDecimal(list.Where(x => x.GuideId == dmodel.GuideId).FirstOrDefault().CommentScore ?? 0))) / (guideScoreList.FirstOrDefault().CommentNum + 1);
+                            guidScore = guideScoreList.FirstOrDefault().TotalScore / guideScoreList.FirstOrDefault().CommentNum;
                         }
                         else
                         {
@@ -3813,8 +3826,9 @@ namespace Mall.Module.Product
             var list = goods_CommentRepository.GetGoodsDetailPageList(pageIndex, pageSize, out count, dmodel);
             if (list != null && list.Any())
             {
+                string goodsIds = string.Join(",", list.Select(x => x.GoodsId));
                 string orderDetailIds = string.Join(",", list.Select(x => x.OrderDetailId));
-                var carCommentList = goods_CommentRepository.GetCarCommentByOrderDetailId(orderDetailIds, dmodel.TenantId, dmodel.MallBaseId);
+                var carCommentList = goods_CommentRepository.GetCarCommentByOrderDetailId(orderDetailIds, goodsIds, dmodel.TenantId, dmodel.MallBaseId);
                 var guideCommentList = goods_CommentRepository.GetGuideCommentByOrderDetailId(orderDetailIds, dmodel.TenantId, dmodel.MallBaseId);
 
                 List<RB_Member_User_Extend> userList = new List<RB_Member_User_Extend>();

Mall.Repository/GuideCar/RB_GuideCar_SiteRegionRepository.cs

@@ -20,7 +20,7 @@ namespace Mall.Repository.GuideCar
         public string DestinationTableName { get { return nameof(RB_Destination); } }
 
         /// <summary>
-        /// 获取物流地区列表
+        /// 获取站点地区列表
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <returns></returns>

Mall.Repository/Product/RB_Goods_CommentRepository.cs

@@ -186,7 +186,7 @@ where  {where}  ";
         /// <param name="tenantId"></param>
         /// <param name="mallBaseId"></param>
         /// <returns></returns>
-        public List<RB_Goods_Comment_Extend> GetCarCommentByOrderDetailId(string orderDetailIds, int tenantId, int mallBaseId)
+        public List<RB_Goods_Comment_Extend> GetCarCommentByOrderDetailId(string orderDetailIds, string goodsIds, int tenantId, int mallBaseId)
         {
             string where = $" 1=1 and c.{nameof(RB_Goods_Comment.Status)}=0  and c.{nameof(RB_Goods_Comment.Is_Show)}=1  and c.{nameof(RB_Goods_Comment.CarId)}>0 ";
             if (tenantId > 0)
@@ -197,9 +197,9 @@ where  {where}  ";
             {
                 where += $@" and c.{nameof(RB_Goods_Comment.MallBaseId)}={mallBaseId}";
             }
-            if (!string.IsNullOrWhiteSpace(orderDetailIds))
+            if (!string.IsNullOrWhiteSpace(goodsIds))
             {
-                where += $@" and c.{nameof(RB_Goods_Comment.OrderDetailId)}in({orderDetailIds}) ";
+                where += $@" and b.ID in({goodsIds}) ";
             }
             string sql = $@"SELECT c.*,a.`Name` as CarName,d.ColorName as CarColorName,cb.`Name` as CarBrandName FROM RB_Goods_Comment c
  LEFT JOIN rb_guidecar_car as a on c.CarId=a.ID
@@ -217,7 +217,7 @@ LEFT JOIN rb_guidecar_carbrand as cb on cb.ID=a.CarBrandId where  {where}  ";
         /// <param name="tenantId"></param>
         /// <param name="mallBaseId"></param>
         /// <returns></returns>
-        public List<RB_Goods_Comment_Extend> GetGuideCommentByOrderDetailId(string orderDetailIds, int tenantId, int mallBaseId)
+        public List<RB_Goods_Comment_Extend> GetGuideCommentByOrderDetailId(string orderDetailIds,  int tenantId, int mallBaseId)
         {
             string where = $" 1=1 and c.{nameof(RB_Goods_Comment.Status)}=0  and c.{nameof(RB_Goods_Comment.Is_Show)}=1  and c.{nameof(RB_Goods_Comment.GuideId)}>0 ";
             if (tenantId > 0)
@@ -230,8 +230,9 @@ LEFT JOIN rb_guidecar_carbrand as cb on cb.ID=a.CarBrandId where  {where}  ";
             }
             if (!string.IsNullOrWhiteSpace(orderDetailIds))
             {
-                where += $@" and c.{nameof(RB_Goods_Comment.OrderDetailId)}in({orderDetailIds}) ";
+                where += $@" and c.{nameof(RB_Goods_Comment.OrderDetailId)} in ({orderDetailIds}) ";
             }
+           
             string sql = $@"SELECT c.*,a.`Name` as GuideName FROM RB_Goods_Comment c LEFT JOIN rb_guidecar_guide as a on c.GuideId=a.ID where  {where}  ";
             return Get<RB_Goods_Comment_Extend>(sql).ToList();
         }
@@ -291,7 +292,7 @@ LEFT JOIN rb_guidecar_carbrand as cb on cb.ID=a.CarBrandId where  {where}  ";
                 {
                     whereGrade += $@" and   t.TotalScore>3 and t.TotalScore<=6";
                 }
-                else
+                else if (dmodel.CommentGrade.Value == Common.Enum.Goods.GoodsCommentTypeEnum.Negative)
                 {
                     whereGrade += $@" and   t.TotalScore>=1 and t.TotalScore<=3";
                 }
@@ -303,7 +304,7 @@ LEFT JOIN rb_guidecar_carbrand as cb on cb.ID=a.CarBrandId where  {where}  ";
 when SUM(CommentScore)>6 then 1 
 ELSE 0     
     end as    CommentGrade
-from rb_goods_comment where {where} GROUP BY OrderDetailId order by CreateDate ) as t  {whereGrade}";
+from rb_goods_comment where {where} GROUP BY OrderDetailId order by CreateDate desc ) as t  {whereGrade}";
             return GetPage<GoodsComment_Extend>(pageIndex, pageSize, out count, sql).ToList();
         }
 

Mall.WebApi/Controllers/Product/AppletGuideCarController.cs

@@ -393,6 +393,32 @@ namespace Mall.WebApi.Controllers.Product
             return ApiResult.Success("", oldLogisticsModel);
         }
 
+        /// <summary>
+        /// 获取站点地区列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSiteRegionList(object requestMsg)
+        {
+            var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            var query = JsonConvert.DeserializeObject<RB_GuideCar_SiteRegion_Extend>(parms.msg.ToString());
+            query.TenantId = parms.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            query.SiteType = 1;
+            var siteRegionList = guideCarModule.GetListRepository(query);
+            if (siteRegionList == null)
+            {
+                siteRegionList = new List<RB_GuideCar_SiteRegion_Extend>();
+            }
+            var result = siteRegionList.Select(x => new
+            {
+                x.ID,
+                x.SiteId,
+                x.RegionId,
+                x.RegionName
+            });
+            return ApiResult.Success("", result);
+        }
 
 
         /// <summary>
@@ -452,7 +478,9 @@ namespace Mall.WebApi.Controllers.Product
                     y.CarBrandName,
                     y.CarColorName,
                     y.CarName,
-                    CreateDate = y.CreateDate.HasValue ? y.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+                    CreateDate = y.CreateDate.HasValue ? y.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                    y.CarId,
+                    y.GuideId
                 })
             });
             return ApiResult.Success("", pagelist);
@@ -467,7 +495,7 @@ namespace Mall.WebApi.Controllers.Product
         public ApiResult GetAppletGoodsCommentStatistics(object requestMsg)
         {
             var req = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
-           
+
             JObject parms = JObject.Parse(req.msg.ToString());
             int GoodsId = parms.GetInt("GoodsId", 0);