From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
index b33f066..00e42ef 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
@@ -85,7 +85,6 @@
                             if(vipPayment1.getPayStatus() != 1){
                                 return;
                             }
-
                             /**
                              * SUCCESS--支付成功
                              * REFUND--转入退款
@@ -210,7 +209,7 @@
                                         vipEndTime = new Date();
                                     }
                                     Calendar calendar = Calendar.getInstance();
-                                    calendar.setTime(new Date());
+                                    calendar.setTime(vipEndTime);
                                     calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
                                     appUser.setVipEndTime(calendar.getTime());
                                     appUserService.updateById(appUser);
@@ -267,7 +266,7 @@
             vipEndTime = new Date();
         }
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime(vipEndTime);
+        calendar.setTime(new Date());
         calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
         appUser.setVipEndTime(calendar.getTime());
         appUserService.updateById(appUser);

--
Gitblit v1.7.1