提交代码

Mall.Repository/User/RB_VipBuy_CommissionRepository.cs

@@ -74,7 +74,7 @@ where {where} order by v.Id desc";
             {
                 where += $@" and v.{nameof(RB_VipBuy_Commission.Id)}={dmodel.Id}";
             }
-            if (!string.IsNullOrEmpty(dmodel.VipIds)) 
+            if (!string.IsNullOrEmpty(dmodel.VipIds))
             {
                 where += $@" and v.{nameof(RB_VipBuy_Commission.Id)} in({dmodel.VipIds})";
             }

Mall.Repository/User/RB_Vip_BuyRepository.cs

@@ -63,10 +63,14 @@ namespace Mall.Repository.User
                 {
                     builder.Append($" AND {nameof(RB_Vip_Buy_Extend.TenantId)}={query.TenantId}");
                 }
-                if (query.TenantId > 0)
+                if (query.MallBaseId > 0)
                 {
                     builder.Append($" AND {nameof(RB_Vip_Buy_Extend.MallBaseId)}={query.MallBaseId}");
                 }
+                if (query.UserId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Vip_Buy_Extend.UserId)}={query.UserId}");
+                }
             }
             return Get<RB_Vip_Buy_Extend>(builder.ToString()).ToList();
         }

Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs

@@ -335,7 +335,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
                 return ApiResult.Failed("您选择的VIP等级不存在");
             }
 
-            if (distributorModel.FXGradeId.HasValue && distributorModel.FXGradeId >= rechargeRulesModel.Grade)
+            if (distributorModel.Grade >= rechargeRulesModel.Grade)
             {
                 return ApiResult.Failed("购买VIP等级低于您当前VIP等级");
             }
@@ -372,7 +372,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             demodel.PayState = 0;
             demodel.Status = 0;
             demodel.CreateDate = DateTime.Now;
-            demodel.ExpiryDate = DateTime.Now.AddYears(rechargeRulesModel.Year ?? 1);
+            demodel.ExpiryDate = Convert.ToDateTime(DateTime.Now.AddYears(rechargeRulesModel.Year ?? 1).AddDays(-1).ToString("yyyy-MM-dd 23:59:59"));
             //新增充值记录
             int memberBuyId = userVipModule.AddVipBuy(demodel);
             if (memberBuyId == 0)

Mall.WebApi/Controllers/User/UserVipController.cs

@@ -110,13 +110,13 @@ namespace Mall.WebApi.Controllers.User
         /// <param name="requestMsg"></param>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetVipBuyPageList(object requestMsg)
+        public ApiResult GetVipBuyPageList()
         {
-            var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
-            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
-            RB_Vip_Buy_Extend demodel = JsonConvert.DeserializeObject<RB_Vip_Buy_Extend>(requestParm.msg.ToString());
-            demodel.TenantId = requestParm.TenantId;
-            demodel.MallBaseId = requestParm.MallBaseId;
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Vip_Buy_Extend demodel = JsonConvert.DeserializeObject<RB_Vip_Buy_Extend>(parms.msg.ToString());
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
             var list = userVipModule.GetVipBuyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
 
             pagelist.count = Convert.ToInt32(count);