From b6a38fc7ee081c8bf3370ee6fe8e7a7dd22e7230 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 02 十一月 2023 08:52:06 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 5930248..ba6c747 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
@@ -84,7 +84,6 @@
if(vipPayment1.getPayStatus() != 1){
return;
}
-
/**
* SUCCESS--支付成功
* REFUND--转入退款
@@ -117,11 +116,13 @@
vipEndTime = new Date();
}
Calendar calendar = Calendar.getInstance();
- calendar.setTime(vipEndTime);
+ calendar.setTime(new Date());
calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
appUser.setIsVip(1);
appUser.setVipEndTime(calendar.getTime());
appUserService.updateById(appUser);
+ // 注册会员送券 先判断是否有注册送券类型的优惠券 判断优惠券状态 审核是否通过 是否删除 是否在有效期内 是否领取数量达上限
+ userConponClient.queryCouponByUser(appUser.getId());
return;
}
if("USERPAYING".equals(trade_state) || "ACCEPT".equals(trade_state)){
@@ -201,10 +202,12 @@
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);
+ // 注册会员送券 先判断是否有注册送券类型的优惠券 判断优惠券状态 审核是否通过 是否删除 是否在有效期内 是否领取数量达上限
+ userConponClient.queryCouponByUser(appUser.getId());
return;
}
if("WAIT_BUYER_PAY".equals(tradeStatus)){
@@ -256,12 +259,11 @@
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);
- // 注册会员送券 先判断是否有注册送券类型的优惠券 判断优惠券状态 审核是否通过 是否删除 是否在有效期内 是否领取数量达上限
- userConponClient.queryCouponByUser(appUser.getId());
+
return ResultUtil.success();
}
--
Gitblit v1.7.1