From 134d13688e4b6677133ba2d362d2978d8bda2b87 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 12 七月 2023 11:46:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 196 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 173 insertions(+), 23 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index 4ab69ac..e55dcac 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -37,10 +37,8 @@
import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp;
import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest;
import com.dsh.account.service.TStudentService;
-import com.dsh.account.util.DateTimeHelper;
-import com.dsh.account.util.DateUtil;
-import com.dsh.account.util.ResultUtil;
-import com.dsh.account.util.ToolUtil;
+import com.dsh.account.util.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -99,6 +97,10 @@
@Resource
private ParticipantClient participantClient;
+
+
+ @Autowired
+ private PayMoneyUtil payMoneyUtil;
@@ -374,35 +376,183 @@
@Override
public ResultUtil renewClassPayment(Integer userIdFormRedis, ClasspaymentRequest request) {
- // TODO: 2023/7/5 续课支付
- switch (request.getPayType()){
- case 1:
- WeChatPayment();
- break;
- case 2:
- AlipayPayment();
- break;
- case 3:
- PlaypaiGoldPayment();
- break;
- default:
- break;
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
+
+ TCoursePackagePayment packagePayment = new TCoursePackagePayment();
+ packagePayment.setCode(code);
+ packagePayment.setAppUserId(userIdFormRedis);
+ packagePayment.setStudentId(request.getStuId());
+ packagePayment.setCoursePackageId(request.getLessonId());
+ packagePayment.setPayType(request.getPayType());
+ packagePayment.setAbsencesNumber(0);
+ packagePayment.setPayUserType(1);
+ packagePayment.setPayStatus(1);
+ packagePayment.setPayUserId(userIdFormRedis);
+ packagePayment.setStatus(1);
+ packagePayment.setState(1);
+ packagePayment.setInsertTime(new Date());
+ couPayClient.savePaymentCoursePackage(packagePayment);
+
+ try {
+ switch (request.getPayType()) {
+ case 1:
+ return WeChatPayment(code,request.getPayAmount());
+ case 2:
+ return AlipayPayment(code,request.getPayAmount());
+ case 3:
+ int i = PlaypaiGoldPayment(code,request);
+ switch (i){
+ case 1:
+ return ResultUtil.success();
+ case 2:
+ return ResultUtil.error("用户未登录！");
+ case 3:
+ return ResultUtil.error("续课失败，玩湃币不足，请充值");
+ case 4:
+ return ResultUtil.error("续课失败，请联系管理员");
+ }
+ default:
+ break;
+ }
+ }catch (Exception e){
+ ResultUtil.runErr();
}
return ResultUtil.success();
}
- public void WeChatPayment(){
-
+ public ResultUtil WeChatPayment(String code,BigDecimal amount) throws Exception {
+ ResultUtil weixinpay = payMoneyUtil.weixinpay("课包续费", "", code, amount.toString(),
+ "/base/coursePackage/wechatPaymentCallback", "APP", "");
+ if(weixinpay.getCode() == 200){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ int num = 1;
+ int wait = 0;
+ while (num <= 10){
+ int min = 5000;
+ wait += (min * num);
+ Thread.sleep(wait);
+ TCoursePackagePayment coursePackagePayment = couPayClient.getCoursePackagePaymentByCode(code);
+ if(coursePackagePayment.getPayStatus() == 2){
+ break;
+ }
+ ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
+ if(resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1){
+ /**
+ * SUCCESS—支付成功，
+ * REFUND—转入退款，
+ * NOTPAY—未支付，
+ * CLOSED—已关闭，
+ * REVOKED—已撤销（刷卡支付），
+ * USERPAYING--用户支付中，
+ * PAYERROR--支付失败(其他原因，如银行返回失败)
+ */
+ Map<String, String> data1 = resultUtil.getData();
+ String s = data1.get("trade_state");
+ String transaction_id = data1.get("transaction_id");
+ if("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
+ coursePackagePayment.setState(3);
+ couPayClient.delPaymentCoursePackage(coursePackagePayment.getId());
+ break;
+ }
+ if("SUCCESS".equals(s)){
+ coursePackagePayment.setPayStatus(2);
+ coursePackagePayment.setOrderNumber(transaction_id);
+ couPayClient.updatePaymentCoursePackage(coursePackagePayment);
+ break;
+ }
+ if("USERPAYING".equals(s)){
+ num++;
+ }
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
+ }
+ return weixinpay;
}
- public void AlipayPayment(){
-
+ public ResultUtil AlipayPayment(String code,BigDecimal amount){
+ ResultUtil alipay = payMoneyUtil.alipay("课包续费", "", "", code, amount.toString(),
+ "/base/coursePackage/alipayPaymentCallback");
+ if(alipay.getCode() == 200){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ int num = 1;
+ int wait = 0;
+ while (num <= 10){
+ int min = 5000;
+ wait += (min * num);
+ Thread.sleep(wait);
+ TCoursePackagePayment coursePackagePayment = couPayClient.getCoursePackagePaymentByCode(code);
+ if(coursePackagePayment.getPayStatus() == 2){
+ break;
+ }
+ ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
+ if(resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1){
+ /**
+ * WAIT_BUYER_PAY（交易创建，等待买家付款）、
+ * TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
+ * TRADE_SUCCESS（交易支付成功）、
+ * TRADE_FINISHED（交易结束，不可退款）
+ */
+ Map<String, String> data1 = resultUtil.getData();
+ String s = data1.get("tradeStatus");
+ String tradeNo = data1.get("tradeNo");
+ if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
+ coursePackagePayment.setState(3);
+ couPayClient.delPaymentCoursePackage(coursePackagePayment.getId());
+ break;
+ }
+ if("TRADE_SUCCESS".equals(s)){
+ coursePackagePayment.setPayStatus(2);
+ coursePackagePayment.setOrderNumber(tradeNo);
+ couPayClient.updatePaymentCoursePackage(coursePackagePayment);
+ break;
+ }
+ if("WAIT_BUYER_PAY".equals(s)){
+ num++;
+ }
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
+ }
+ return alipay;
}
- public void PlaypaiGoldPayment(){
-
+ public int PlaypaiGoldPayment(String code,ClasspaymentRequest request){
+ PlayPaiGoldCoursePackage paiGoldCoursePackage = new PlayPaiGoldCoursePackage();
+ paiGoldCoursePackage.setCoursePackageId(request.getLessonId());
+ paiGoldCoursePackage.setStuId(request.getStuId());
+ paiGoldCoursePackage.setCoursePayConfigId(request.getCourseConfigId());
+ paiGoldCoursePackage.setCode(code);
+ return couPayClient.paymentWanpaiRenewCourse(paiGoldCoursePackage);
}
+ @Override
+ public ResultUtil insertVipPaymentCallback(String code, String orderNumber) {
+ TCoursePackagePayment coursePackagePayment = couPayClient.getCoursePackagePaymentByCode(code);
+ if(coursePackagePayment.getPayStatus() != 1){
+ return ResultUtil.success();
+ }
+ coursePackagePayment.setPayStatus(2);
+ coursePackagePayment.setOrderNumber(orderNumber);
+ couPayClient.updatePaymentCoursePackage(coursePackagePayment);
+ return ResultUtil.success();
+ }
+
}
--
Gitblit v1.7.1