1

Mall.Module.Product/OrderModule.cs

@@ -2887,15 +2887,22 @@ namespace Mall.Module.Product
                     foreach (var item in demodel.DetailList)
                     {
                         if (item.PresentFXGrade > 0)
+                        {
+                            //查询是否有申请退款
+                            var afterSaleList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetialId = item.Id, Type = 1, MallBaseId = demodel.MallBaseId, TenantId = demodel.TenantId });
+                            if (!afterSaleList.Any())
                             {
                                 //有赠送粉象等级
-                            GradeList.Add(item.PresentFXGrade??0);
+                                GradeList.Add(item.PresentFXGrade ?? 0);
                                 if (item.PresentFXGrade == (VIPModel?.Id ?? 0))
                                 {
                                     VIPMonths += (item.PresentFXMonth ?? 0) * (item.Number ?? 0);
                                 }
                             }
                         }
+                    }
+                    if (GradeList.Any())
+                    {
                         //判断等级 取最高级别
                         int MaxGradeId = 0;
                         int MaxGrade = 0;
@@ -3033,6 +3040,7 @@ namespace Mall.Module.Product
                     }
                 }
             }
+        }
 
         /// <summary>
         /// 其他付款

Mall.Module.User/UserModule.cs

@@ -2987,10 +2987,14 @@ namespace Mall.Module.User
             //分销商等级
             string GradeName = "默认等级";
             int HpEnabled = 2;
+            int IsVip = 2;
             if ((basicsModel?.IsEnableFXGrade ?? 0) == 1)
             {
                 var gmodel = distributor_FXGradeRepository.GetEntity(model.FXGradeId);
                 GradeName = gmodel?.GradeName ?? "默认等级";
+                if (gmodel.IsGuest == 3) {
+                    IsVip = 1;
+                }
             }
             else
             {
@@ -3097,6 +3101,8 @@ namespace Mall.Module.User
                     RemitMoney = remitMoney,
                     ReferralsNum = (basicsModel?.IsEnableFXGrade ?? 0) == 1 ? fxNum : (oneNum + twoNum + threeNum),
                     IsEnableFXGrade = (basicsModel?.IsEnableFXGrade ?? 0),
+                    IsVip,
+                    VipExpiryDate = model.VipExpiryDate.HasValue ? model.VipExpiryDate.Value.ToString("yyyy-MM-dd") : "",
                     VipBuyCommission
                 }
             };

Mall.WindowsService/Module/FinanceModule.cs

@@ -883,6 +883,10 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                     foreach (var item in demodel.DetailList)
                     {
                         if (item.PresentFXGrade > 0)
+                        {
+                            //查询是否有申请退款
+                            var afterSaleList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetialId = item.Id, Type = 1, MallBaseId = demodel.MallBaseId, TenantId = demodel.TenantId });
+                            if (!afterSaleList.Any())
                             {
                                 //有赠送粉象等级
                                 GradeList.Add(item.PresentFXGrade ?? 0);
@@ -892,6 +896,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                                 }
                             }
                         }
+                    }
                     //判断等级 取最高级别
                     int MaxGradeId = 0;
                     int MaxGrade = 0;