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

Mall.Module.BaseSetUp/DestinationModule.cs

@@ -32,6 +32,16 @@ namespace Mall.Module.BaseSetUp
             return rb_DestinationRepository.GetListExt(where);
         }
 
+        /// <summary>
+        /// 根据地区名称获取地区列表
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public List<Model.Extend.BaseSetUp.RB_Destination_Extend> GetDestinationListByNames(string[] where)
+        {
+            return rb_DestinationRepository.GetListByNames(where);
+        }
+
         /// <summary>
         /// 获取列表
         /// </summary>

Mall.Module.Product/GuideCarModule.cs

@@ -3763,7 +3763,7 @@ namespace Mall.Module.Product
             //订单状态
             List<RB_Goods_Order_Extend> olist = goods_OrderRepository.GetAppletGoodsOrderNumStatistics(userId, tenantId, mallBaseId);
             //待评价
-            int WaitCommentNum = goods_OrderRepository.GetAppletGoodsOrderWaitCommentNum(userId, tenantId, mallBaseId);
+            int WaitCommentNum = goods_OrderRepository.GetAppletGoodsOrderWaitCommentNum(userId, tenantId, mallBaseId, 1);
             //售后处理中
             int AfterSaleNum = goods_OrderRepository.GetAppletGoodsOrderAfterSaleNum(userId, tenantId, mallBaseId);
 
@@ -3872,7 +3872,9 @@ namespace Mall.Module.Product
                     x.GuidePhoto,
                     x.GuideScore,
                     x.GuideTelephone,
-                    x.GuideWorkYears
+                    x.GuideWorkYears,
+                    x.CarId,
+                    x.GuideId
                 }),
                 model.IsApplyForCancel,
                 model.RejectRemark,

Mall.Repository/Product/RB_Goods_OrderDetailRepository.cs

@@ -558,6 +558,10 @@ where {where}  order by o.CreateDate desc";
             {
                 where += $@" and a.{nameof(RB_Goods_OrderDetail.OrderId)}={dmodel.OrderId}";
             }
+            if (dmodel.OrderClassify > -1)
+            {
+                where += $@" and o.{nameof(RB_Goods_Order.OrderClassify)}={dmodel.OrderClassify}";
+            }
             if (dmodel.OrderType > 0)
             {
                 where += $@" and a.{nameof(RB_Goods_OrderDetail.OrderType)}={(int)dmodel.OrderType}";

Mall.WebApi/Controllers/Product/AppletGCOrderController.cs

@@ -248,6 +248,7 @@ namespace Mall.WebApi.Controllers.Product
                     SpecificationList = JsonConvert.DeserializeObject<List<string>>(y.Specification),
                     y.ProductCode,
                     y.Final_Price,
+                    y.Unit_Price,
                     y.Number,
                     y.UseDay,
                     y.IsSpell,

Mall.WebApi/Controllers/Product/AppletGuideCarController.cs

@@ -27,6 +27,47 @@ namespace Mall.WebApi.Controllers.Product
         private readonly GuideCarModule guideCarModule = new GuideCarModule();
 
 
+        /// <summary>
+        /// 地区模块处理类
+        /// </summary>
+        private Module.BaseSetUp.DestinationModule destinationModule = new Module.BaseSetUp.DestinationModule();
+
+
+
+
+        /// <summary>
+        /// 根据地区名称获取地区列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public virtual ApiResult GetDestinationListByNames(object requestMsg)
+        {
+            var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            JObject parm = JObject.Parse(parms.msg.ToString());
+            var area = parm.GetStringValue("area");
+            var where = Common.Plugin.JsonHelper.DeserializeObject<string[]>(area);
+            var list = destinationModule.GetDestinationListByNames(where);
+            return ApiResult.Success(data: list.Select(qitem => new { qitem.ID, qitem.Name, qitem.CodeLevel, qitem.ParentID }));
+        }
+
+
+
+
+
+        [HttpPost]
+        public ApiResult GetAllList(object requestMsg)
+        {
+            var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            JObject parm = JObject.Parse(parms.msg.ToString());
+            var list = destinationModule.GetAllList();
+            var result = list.Where(x => x.CodeLevel == Common.Enum.AreaRegionEnum.CityEnum).Select(x => new { x.ID, x.Name, x.CodeLevel ,x.PinYin,x.ParentID});
+            return ApiResult.Success("", result);
+        }
+
+
+
+
+
         #region 商品详情
 
         /// <summary>
@@ -426,6 +467,8 @@ namespace Mall.WebApi.Controllers.Product
             {
                 siteRegionList = new List<RB_GuideCar_SiteRegion_Extend>();
             }
+            JObject parm = JObject.Parse(parms.msg.ToString());
+            var list = destinationModule.GetAllList();
             var result = siteRegionList.Select(x => new
             {
                 x.ID,

Mall.WebApi/Controllers/Product/GuideCarController.cs

@@ -1205,7 +1205,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 }
                 if (string.IsNullOrWhiteSpace(query.Introduction))
                 {
-                    return ApiResult.Failed("请输入间接");
+                    return ApiResult.Failed("请输入简介");
                 }
 
                 query.TenantId = UserInfo.TenantId;