From dbcaaa33fdd45c704fd40926df0a542556e8e4f2 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期五, 18 九月 2026 17:15:09 +0800
Subject: [PATCH] feat：门店店长手机号列表展示问题
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index 271976a..20dd3af 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -2,6 +2,7 @@
import cn.mb.cloud.common.data.controller.BaseController;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,6 +15,8 @@
import com.dsh.course.model.vo.TQueryBenefitsVideosVO;
import com.dsh.course.service.*;
import com.dsh.course.util.*;
+import com.dsh.course.util.wx.WxV3PayConfig;
+import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -26,8 +29,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -267,6 +272,47 @@
* @param response
*/
@ResponseBody
+ @PostMapping("/base/course/weChatPaymentCourseCallback1")
+ public void weChatPaymentCourseCallback1(HttpServletRequest request, HttpServletResponse response) {
+ try {
+ System.err.println("微信回调");
+ System.err.println("请求" + request);
+ BufferedReader reader = request.getReader();
+ String string1 = reader.toString();
+ System.err.println("请求reader" + string1);
+ StringBuilder requestBody = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ requestBody.append(line);
+ }
+ System.err.println("全部请求体" + requestBody);
+ JSONObject jsonObject = JSONObject.parseObject(requestBody.toString());
+ JSONObject resource = jsonObject.getJSONObject("resource");
+
+ AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8));
+ String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8),
+ resource.getString("ciphertext"));
+ System.err.println("微信解密的字符串信息" + decryptedData);
+ JSONObject jsonInfo = (JSONObject) JSONObject.parse(decryptedData);
+ String code = jsonInfo.getString("out_trade_no");
+ String transaction_id = jsonInfo.getString("transaction_id");
+ String trade_state = jsonInfo.getString("trade_state");
+ String attach = jsonInfo.getString("attach");
+ if (trade_state.equals("SUCCESS")) {
+
+ ResultUtil resultUtil = coursePackageService.paymentCourseCallback(code, transaction_id, attach);
+ if (resultUtil.getCode() == 200) {
+ PrintWriter out = response.getWriter();
+ out.write("SUCCESS");
+ out.flush();
+ out.close();
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ @ResponseBody
@PostMapping("/base/course/weChatPaymentCourseCallback")
public void weChatPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response) {
try {
@@ -289,7 +335,6 @@
e.printStackTrace();
}
}
-
/**
* 购买课程支付宝回调
@@ -459,10 +504,12 @@
public List<String> queryPackageById(@RequestBody Integer coursePackageId) {
ArrayList<String> strings = new ArrayList<>();
TCoursePackage byId = coursePackageService.getById(coursePackageId);
+ if(null == byId){
+ return null;
+ }
Integer coursePackageTypeId = byId.getCoursePackageTypeId();
strings.add(coursePackageTypeService.getById(coursePackageTypeId).getName());
strings.add(byId.getName());
-
return strings;
}
@@ -571,10 +618,13 @@
if (ToolUtil.isNotEmpty(data)) {
String stime = data.split(" - ")[0] + " 00:00:00";
String etime = data.split(" - ")[1] + " 23:59:59";
+ // 课程订单没有单独 payTime 字段；已支付订单以创建时间作为支付入账时间。
wrapper.between(CoursePackageOrder::getInsertTime, stime, etime);
}
wrapper.in(CoursePackageOrder::getCoursePackageId, ids);
wrapper.eq(CoursePackageOrder::getPayStatus, 2);
+ wrapper.eq(CoursePackageOrder::getState, 1);
+ wrapper.eq(CoursePackageOrder::getStatus, 1);
ArrayList<Integer> objects = new ArrayList<>();
objects.add(1);
objects.add(2);
@@ -588,9 +638,12 @@
collect.add(-1);
}
//
- List<TCoursePackage> list2 = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect));
+ List<TCoursePackage> list2 = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>()
+ .in(TCoursePackage::getId, collect)
+ .ne(TCoursePackage::getState, 3));
// 课类型
- List<TCoursePackageType> list1 = coursePackageTypeService.list();
+ List<TCoursePackageType> list1 = coursePackageTypeService.list(
+ new LambdaQueryWrapper<TCoursePackageType>().ne(TCoursePackageType::getState, 3));
for (CoursePackageOrder tCoursePackagePayment : list) {
for (TCoursePackage tCoursePackage : list2) {
--
Gitblit v1.7.1