调整

Mall.Module.Product/OrderModule.cs

@@ -5089,6 +5089,7 @@ namespace Mall.Module.Product
                     {
                         var fxGModel = FXGradeList.Where(x => x.Id == item.Grade).FirstOrDefault();
                         item.GradeDescription = fxGModel?.GradeName ?? "暂无等级";
+                        item.GradeDescription += "佣金";
                     }
                 }
             }

Mall.Module.Product/ProductModule.cs

@@ -1641,7 +1641,7 @@ namespace Mall.Module.Product
                 if (model.PresentFXGrade > 0) {
                     var fxmodel = distributor_FXGradeRepository.GetEntity(model.PresentFXGrade);
                     if (fxmodel != null) {
-                        PresentFXGradeMsg = "购买收货后赠送" + fxmodel + "会员";
+                        PresentFXGradeMsg = "购买收货后赠送" + fxmodel.GradeName + "会员";
                         if (model.PresentFXMonth > 0) {
                             PresentFXGradeMsg += (model.PresentFXMonth ?? 0) + "个月";
                         }
@@ -3594,6 +3594,8 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.ProxyRises),demodel.ProxyRises},
                         { nameof(RB_Goods.ProxyMoney),demodel.ProxyMoney},
                          { nameof(RB_Goods.Commission),demodel.Commission},
+                         { nameof(RB_Goods.PresentFXGrade),demodel.PresentFXGrade},
+                         { nameof(RB_Goods.PresentFXMonth),demodel.PresentFXMonth},
                     };
                     if (goodsModel.IsProcurement == 1)
                     {

Mall.Module.User/UserModule.cs

@@ -3795,7 +3795,7 @@ namespace Mall.Module.User
                 var fxlist = distributor_FXGradeRepository.GetList(new RB_Distributor_FXGrade_Extend() { GradeIds = fxgradeids, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
                 foreach (var item in List) {
                     var fxmodel = fxlist.Where(x => x.Id == item.Grade).FirstOrDefault();
-                    item.GradeDescription = fxmodel.GradeName + "分销";
+                    item.GradeDescription = fxmodel.GradeName + "佣金";
                 }
             }
             return List;

Mall.Repository/User/RB_Vip_BuyRepository.cs

@@ -128,7 +128,7 @@ WHERE a.{nameof(RB_Vip_Buy_Extend.Status)}=0 ");
                     builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.OrderNo)} like '%{query.OrderNo}%'");
                 }
             }
-            builder.Append($@" group by a.Id");
+            builder.Append($@" group by a.Id order by a.Id desc");
             return GetPage<RB_Vip_Buy_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
         }
     }