From f21cf2729f0ebf3cfea564c8bc0fc7349cdabe48 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 14 十二月 2023 09:23:56 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 30 ++++-----
cloud-server-management/src/main/webapp/WEB-INF/view/login.html | 6 +-
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 115 ++++++++++++++++++++++++--------------
4 files changed, 90 insertions(+), 63 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index dee116e..9c089ac 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -927,27 +927,40 @@
CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(paymentCourseVo.getCoursePackagePaymentConfigId());
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
- //生成支付订单
- CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
- coursePackageOrder.setCode(code);
- coursePackageOrder.setAppUserId(uid);
- coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
- coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
- coursePackageOrder.setPayType(paymentCourseVo.getPayType());
- coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
- coursePackageOrder.setOriginalPrice(paymentCourseVo.getPrice());
- coursePackageOrder.setUserCouponId(paymentCourseVo.getCouponId());
- coursePackageOrder.setCashPayment(new BigDecimal(paymentPrice));
- coursePackageOrder.setPayUserType(1);
- coursePackageOrder.setPayStatus(1);
- coursePackageOrder.setPayUserId(uid);
- coursePackageOrder.setStatus(1);
- coursePackageOrder.setState(1);
- coursePackageOrder.setInsertTime(new Date());
- coursePackageOrderService.save(coursePackageOrder);
+ Long orderId = paymentCourseVo.getOrderId();
+ if(null == orderId){
+ //生成支付订单
+ CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
+ coursePackageOrder.setCode(code);
+ coursePackageOrder.setAppUserId(uid);
+ coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
+ coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
+ coursePackageOrder.setPayType(paymentCourseVo.getPayType());
+ coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
+ coursePackageOrder.setOriginalPrice(paymentCourseVo.getPrice());
+ coursePackageOrder.setUserCouponId(paymentCourseVo.getCouponId());
+ coursePackageOrder.setCashPayment(new BigDecimal(paymentPrice));
+ coursePackageOrder.setPayUserType(1);
+ coursePackageOrder.setPayStatus(1);
+ coursePackageOrder.setPayUserId(uid);
+ coursePackageOrder.setStatus(1);
+ coursePackageOrder.setState(1);
+ coursePackageOrder.setInsertTime(new Date());
+ coursePackageOrderService.save(coursePackageOrder);
+ orderId = coursePackageOrder.getId();
+ }else{
+ CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(orderId);
+ code = coursePackageOrder.getCode();
+ coursePackageOrder.setPayType(1);
+ coursePackageOrder.setAppUserId(null);
+ coursePackageOrder.setPayUserType(1);
+ coursePackageOrder.setPayUserId(uid);
+ coursePackageOrderService.updateById(coursePackageOrder);
+ }
ResultUtil weixinpay = payMoneyUtil.weixinpay("购买课程", coursePackagePaymentConfig.getId().toString(), code, paymentPrice.toString(), "/base/course/weChatPaymentCourseCallback", "APP", "");
if (weixinpay.getCode() == 200) {
+ String finalCode = code;
new Thread(new Runnable() {
@Override
public void run() {
@@ -959,11 +972,11 @@
wait += (min * num);
Thread.sleep(wait);
CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
- .eq("code", code).eq("state", 1));
+ .eq("code", finalCode).eq("state", 1));
if (coursePackageOrder1.getPayStatus() == 2) {
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
+ ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(finalCode, "");
if (resultUtil.getCode() == 200 && coursePackageOrder1.getPayStatus() == 1) {
/**
* SUCCESS—支付成功，
@@ -1023,8 +1036,8 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
//生成支付订单
- CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
if (paymentCourseVo.getOrderId()==null){
+ CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
coursePackageOrder.setCode(code);
coursePackageOrder.setAppUserId(uid);
coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
@@ -1042,7 +1055,13 @@
coursePackageOrder.setInsertTime(new Date());
coursePackageOrderService.save(coursePackageOrder);
}else {
- code = coursePackageOrderService.getById(paymentCourseVo.getOrderId()).getCode();
+ CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(paymentCourseVo.getOrderId());
+ code = coursePackageOrder.getCode();
+ coursePackageOrder.setPayType(2);
+ coursePackageOrder.setAppUserId(null);
+ coursePackageOrder.setPayUserType(1);
+ coursePackageOrder.setPayUserId(uid);
+ coursePackageOrderService.updateById(coursePackageOrder);
}
ResultUtil alipay = payMoneyUtil.alipay("购买课程", "购买课程", coursePackagePaymentConfig.getId().toString(), code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
@@ -1125,27 +1144,39 @@
CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getById(paymentCourseVo.getCoursePackagePaymentConfigId());
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
- //生成支付订单
- CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
- coursePackageOrder.setCode(code);
- coursePackageOrder.setAppUserId(appUser.getId());
- coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
- coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
- coursePackageOrder.setPayType(paymentCourseVo.getPayType());
- coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
- coursePackageOrder.setOriginalPrice(paymentCourseVo.getPrice());
- coursePackageOrder.setUserCouponId(paymentCourseVo.getCouponId());
- coursePackageOrder.setCashPayment(new BigDecimal(paymentPrice));
- coursePackageOrder.setPlayPaiCoin(paymentCourseVo.getPrice().intValue());
- coursePackageOrder.setPayUserType(1);
- coursePackageOrder.setPayStatus(2);
- coursePackageOrder.setPayUserId(appUser.getId());
- coursePackageOrder.setStatus(1);
- coursePackageOrder.setState(1);
- coursePackageOrder.setInsertTime(new Date());
- coursePackageOrderService.save(coursePackageOrder);
+ Long orderId = paymentCourseVo.getOrderId();
+ if(null == orderId){
+ //生成支付订单
+ CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
+ coursePackageOrder.setCode(code);
+ coursePackageOrder.setAppUserId(appUser.getId());
+ coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
+ coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
+ coursePackageOrder.setPayType(paymentCourseVo.getPayType());
+ coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
+ coursePackageOrder.setOriginalPrice(paymentCourseVo.getPrice());
+ coursePackageOrder.setUserCouponId(paymentCourseVo.getCouponId());
+ coursePackageOrder.setCashPayment(new BigDecimal(paymentPrice));
+ coursePackageOrder.setPlayPaiCoin(paymentCourseVo.getPrice().intValue());
+ coursePackageOrder.setPayUserType(1);
+ coursePackageOrder.setPayStatus(2);
+ coursePackageOrder.setPayUserId(appUser.getId());
+ coursePackageOrder.setStatus(1);
+ coursePackageOrder.setState(1);
+ coursePackageOrder.setInsertTime(new Date());
+ coursePackageOrderService.save(coursePackageOrder);
+ orderId = coursePackageOrder.getId();
+ }else{
+ CoursePackageOrder coursePackageOrder = coursePackageOrderService.getById(orderId);
+ coursePackageOrder.setPayType(3);
+ coursePackageOrder.setAppUserId(null);
+ coursePackageOrder.setPayUserId(appUser.getId());
+ coursePackageOrder.setPayUserType(1);
+ coursePackageOrder.setPayStatus(2);
+ coursePackageOrderService.updateById(coursePackageOrder);
+ }
- addCoursePackageOrderStudent(coursePackageOrder.getId(), coursePackagePaymentConfig);
+ addCoursePackageOrderStudent(orderId, coursePackagePaymentConfig);
return ResultUtil.success();
}
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index 1623b02..fd80080 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -287,23 +287,19 @@
Page<Competition> competitions = competitionClient.list(listQuery);
List<Competition> records = new ArrayList<>();
for (Competition competition : competitions.getRecords()) {
- if (competition.getStatus()==4){
- continue;
- }
-
- // 当前时间小于开始时间
- if (competition.getStartTime().after(new Date())){
- competition.setStatus(1);
- }
- if (competition.getStartTime().before(new Date())){
-
-
- if (competition.getEndTime().after(new Date())){
- competition.setStatus(2);
- }else{
- competition.setStatus(3);
- }
- }
+// // 当前时间小于开始时间
+// if (competition.getStartTime().after(new Date())){
+// competition.setStatus(1);
+// }
+// if (competition.getStartTime().before(new Date())){
+//
+//
+// if (competition.getEndTime().after(new Date())){
+// competition.setStatus(2);
+// }else{
+// competition.setStatus(3);
+// }
+// }
if (competition.getStatus()!=state && state != null){
}else{
records.add(competition);
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/login.html b/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
index 2846a61..a90987a 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/login.html
@@ -64,16 +64,16 @@
<form class="m-t" role="form" action="${ctxPath}/login" method="post">
<div class="item">
<img src="${ctxPath}/img/account.png" />
- <input class="itemInput" type="text" name="username" id="username" placeholder="请输入账号" required="" value="">
+ <input class="itemInput" type="text" name="username" id="username" placeholder="请输入账号" required="" value="admin">
</div>
<div class="item">
<img src="${ctxPath}/img/password.png" />
- <input class="itemInput" type="password" name="password" id="password" placeholder="请输入密码" required="" value="">
+ <input class="itemInput" type="password" name="password" id="password" placeholder="请输入密码" required="" value="123456">
</div>
<div class="form-group" style="float: left;">
<div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">
- <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="" value="">
+ <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="" value="111111">
</div>
<div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
<img src="${ctxPath}/kaptcha" id="kaptcha" width="90px" height="34px"/>
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js b/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js
index 019b22a..639f1c2 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/cpPayment/cpPayment_info.js
@@ -243,7 +243,7 @@
ajax.start();
};
TQuestion.addSubmit = function () {
- let studentId = $("#studentId").val();
+ let studentId = $("#student").val();
let pCode = $("#pCode").val();
let cCode = $("#cCode").val();
let store = $("#store").val();
--
Gitblit v1.7.1