提交代码

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,1);
+            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/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;