From 8e2d31e804cd7fd5736c9c2e7b755b153b462f7a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 13 十月 2023 14:02:20 +0800
Subject: [PATCH] 10.12
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 63232b4..783baee 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
@@ -5,15 +5,19 @@
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.VipPayment;
import com.dsh.account.mapper.VipPaymentMapper;
+import com.dsh.account.model.IncomeQuery;
import com.dsh.account.service.IVipPaymentService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -28,6 +32,8 @@
@Autowired
private PayMoneyUtil payMoneyUtil;
+ @Autowired
+ private VipPaymentMapper vipPaymentMapper;
@@ -66,7 +72,7 @@
public ResultUtil weixinpay(VipPayment vipPayment) throws Exception{
String code = vipPayment.getCode();
ResultUtil weixinpay = payMoneyUtil.weixinpay("购买年度会员", "", code, vipPayment.getAmount().toString(),
- "/base/appUser/addVipPaymentWeChatCallback", "APP");
+ "/base/appUser/addVipPaymentWeChatCallback", "APP", "");
if(weixinpay.getCode() == 200){
new Thread(new Runnable() {
@Override
@@ -152,7 +158,7 @@
*/
public ResultUtil alipay(VipPayment vipPayment) throws Exception{
String code = vipPayment.getCode();
- ResultUtil alipay = payMoneyUtil.alipay("购买年度会员", "", code, vipPayment.getAmount().toString(),
+ ResultUtil alipay = payMoneyUtil.alipay("购买年度会员", "购买年度会员", "", code, vipPayment.getAmount().toString(),
"/base/appUser/addVipPaymentAliCallback");
if(alipay.getCode() == 200){
new Thread(new Runnable() {
@@ -257,4 +263,6 @@
appUserService.updateById(appUser);
return ResultUtil.success();
}
+
+
}
--
Gitblit v1.7.1