From 94f34a5cf9ab374afbaefd566bc0a3dc8a4616dd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 11:14:37 +0800
Subject: [PATCH] 同步
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 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 8d44548..a1b9533 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
@@ -1,5 +1,6 @@
package com.dsh.account.service.impl;
+import com.alibaba.fastjson.JSON;
import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,11 +12,13 @@
import com.dsh.account.service.IVipPaymentService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.util.PayMoneyUtil;
+import com.dsh.account.util.RedisUtil;
import com.dsh.account.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
@@ -34,6 +37,13 @@
@Autowired
private PayMoneyUtil payMoneyUtil;
+
+ @Resource
+ private UserConponClient userConponClient;
+
+ @Autowired
+ private RedisUtil redisUtil;
+
/**
* 购买年度会员
@@ -82,7 +92,7 @@
int min = 5000;
wait += (min * num);
VipPayment vipPayment1 = VipPaymentServiceImpl.this.getOne(new QueryWrapper<VipPayment>().eq("code", code));
- if(vipPayment1.getPayStatus() != 1){
+ if(vipPayment1.getPayStatus() == 2){
return;
}
/**
@@ -123,7 +133,8 @@
appUser.setVipEndTime(calendar.getTime());
appUserService.updateById(appUser);
// 注册会员送券 先判断是否有注册送券类型的优惠券 判断优惠券状态 审核是否通过 是否删除 是否在有效期内 是否领取数量达上限
- userConponClient.queryCouponByUser(appUser.getId());
+ List<Long> longs = userConponClient.queryCouponByUser(appUser.getId());
+ redisUtil.setStrValue("VIP_P_" + vipPayment1.getAppUserId(), JSON.toJSONString(longs), 3600);
return;
}
if("USERPAYING".equals(trade_state) || "ACCEPT".equals(trade_state)){
@@ -214,7 +225,8 @@
appUser.setVipEndTime(calendar.getTime());
appUserService.updateById(appUser);
// 注册会员送券 先判断是否有注册送券类型的优惠券 判断优惠券状态 审核是否通过 是否删除 是否在有效期内 是否领取数量达上限
- userConponClient.queryCouponByUser(appUser.getId());
+ List<Long> longs = userConponClient.queryCouponByUser(appUser.getId());
+ redisUtil.setStrValue("VIP_P_" + vipPayment1.getAppUserId(), JSON.toJSONString(longs), 3600);
return;
}
if("WAIT_BUYER_PAY".equals(tradeStatus)){
@@ -241,8 +253,7 @@
- @Autowired
- private UserConponClient userConponClient;
+
/**
* 购买年度会员支付回调处理
* @param code
@@ -252,7 +263,7 @@
@Override
public synchronized ResultUtil addVipPaymentCallback(String code, String orderNumber) throws Exception {
VipPayment vipPayment1 = VipPaymentServiceImpl.this.getOne(new QueryWrapper<VipPayment>().eq("code", code));
- if(vipPayment1.getPayStatus() != 1){
+ if(vipPayment1.getPayStatus() == 2){
return ResultUtil.success();
}
vipPayment1.setPayStatus(2);
@@ -261,16 +272,14 @@
VipPaymentServiceImpl.this.updateById(vipPayment1);
TAppUser appUser = appUserService.getById(vipPayment1.getAppUserId());
- Date vipEndTime = appUser.getVipEndTime();
- if(null == vipEndTime){
- vipEndTime = new Date();
- }
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
appUser.setVipEndTime(calendar.getTime());
appUserService.updateById(appUser);
-
+ // 注册会员送券 先判断是否有注册送券类型的优惠券 判断优惠券状态 审核是否通过 是否删除 是否在有效期内 是否领取数量达上限
+ List<Long> longs = userConponClient.queryCouponByUser(appUser.getId());
+ redisUtil.setStrValue("VIP_P_" + vipPayment1.getAppUserId(), JSON.toJSONString(longs), 3600);
return ResultUtil.success();
}
--
Gitblit v1.7.1