Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Module.Product/OrderModule.cs

@@ -632,6 +632,7 @@ namespace Mall.Module.Product
                     SpecificationList = JsonConvert.DeserializeObject<List<string>>(x.Specification),
                     x.Number,
                     x.Final_Price,
+                    x.IsComment,
                     x.IsApplyForAfterSale
                 }),
                 model.IsApplyForCancel,
@@ -7103,9 +7104,9 @@ namespace Mall.Module.Product
                 if (dmodel == null) { return false; }
                 OrderId = dmodel.OrderId ?? 0;
                 if (dmodel.IsComment == 1) { return false; }
-                omodel = goods_OrderRepository.GetEntity(OrderId);
-                if (omodel == null) { return false; }
-                if (omodel.OrderStatus != OrderStatusEnum.Received) { return false; }
+                //omodel = goods_OrderRepository.GetEntity(OrderId);
+                //if (omodel == null) { return false; }
+                //if (omodel.OrderStatus != OrderStatusEnum.Received) { return false; }
             }
             bool flag = goods_CommentRepository.Insert(demodel) > 0;
             if (flag)
@@ -7124,7 +7125,7 @@ namespace Mall.Module.Product
                         }
                     };
                     goods_OrderDetailRepository.Update(keyValues, wheres);
-                    if (OrderId > 0)
+                    if (OrderId < 0)
                     {
                         var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = OrderId, IsComment = 2, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
                         if (!dlist.Any())

Mall.Repository/Product/RB_Goods_CommentRepository.cs

@@ -91,9 +91,14 @@ where {where} order by c.Id desc";
             {
                 where += $@" and c.{nameof(RB_Goods_Comment.CommentGrade)}={(int)dmodel.CommentGrade}";
             }
-            if (dmodel.GoodsId > 0) {
+            if (dmodel.GoodsId > 0) 
+            {
                 where += $@" and c.{nameof(RB_Goods_Comment.GoodsId)}={dmodel.GoodsId}";
             }
+            if (dmodel.UserId > 0) 
+            {
+                where += $@" and c.{nameof(RB_Goods_Comment.UserId)}={dmodel.UserId}";
+            }
             if (dmodel.PlatformSource > 0)
             {
                 where += $@" and c.{nameof(RB_Goods_Comment.PlatformSource)}={(int)dmodel.PlatformSource}";

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -1007,6 +1007,9 @@ namespace Mall.WebApi.Controllers.MallBase
                 if (Rparms.GetStringValue("Success").ToLower() == "true")
                 {
                     List<Model.Query.ExpressTraces> list = JsonConvert.DeserializeObject<List<Model.Query.ExpressTraces>>(Rparms.GetStringValue("Traces"));
+                    if (list.Any()) {
+                        list = list.OrderByDescending(x => x.AcceptTime).ToList();
+                    }
                     return ApiResult.Success("", list);
                 }
                 else