From b48aadeea1f9ac8764a3a6f295bd53effca8faec Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 22:04:09 +0800
Subject: [PATCH] bug：收入类型统计数据bug
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 211 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 166 insertions(+), 45 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 154f99b..a6fa3d7 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,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
@@ -59,8 +65,14 @@
@Autowired
private TCoursePackageDiscountService discountService;
+
@Autowired
private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
+
+ @Autowired
+ private ICoursePackageOrderService coursePackageOrderService;
+
+
/**
* 上/下架 1为上架 2为下架 3为删除
@@ -123,6 +135,29 @@
return ResultUtil.runErr();
}
}
+
+ @ResponseBody
+ @PostMapping("/base/course/queryCoursePackageType")
+ @ApiOperation(value = "获取课程类型列表", tags = {"APP-课程列表"})
+ @ApiImplicitParams({
+ })
+ public ResultUtil<List<BaseVo>> queryCoursePackageType1() {
+ try {
+ List<TCoursePackageType> coursePackageTypes = coursePackageTypeService.list(new QueryWrapper<TCoursePackageType>().eq("state", 1));
+ List<BaseVo> list = new ArrayList<>();
+ coursePackageTypes.forEach(c -> {
+ BaseVo baseVo = new BaseVo();
+ BeanUtils.copyProperties(c, baseVo);
+ list.add(baseVo);
+ });
+ return ResultUtil.success(list);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
@ResponseBody
@@ -170,15 +205,16 @@
@ApiImplicitParam(value = "课包id", name = "id", dataType = "int", required = true),
@ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = false),
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
+ @ApiImplicitParam(value = "学员id", name = "stuId", dataType = "int", required = false),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<CoursePackageInfo> queryCourseInfo(Integer id, String lon, String lat, Long payId) {
+ public ResultUtil<CoursePackageInfo> queryCourseInfo(Integer id, String lon, String lat, Integer stuId) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if (null == uid) {
return ResultUtil.tokenErr();
}
- CoursePackageInfo coursePackageInfo = coursePackageService.queryCourseInfo(uid, id, lon, lat);
+ CoursePackageInfo coursePackageInfo = coursePackageService.queryCourseInfo(uid, id, lon, lat, stuId);
return ResultUtil.success(coursePackageInfo);
} catch (Exception e) {
e.printStackTrace();
@@ -210,7 +246,7 @@
}
}
- // 2.0
+
@ResponseBody
@PostMapping("/api/course/paymentCourseCouponList")
@ApiOperation(value = "支付课程--完成后优惠券列表", tags = {"APP-课程列表"})
@@ -237,6 +273,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 {
@@ -259,7 +336,6 @@
e.printStackTrace();
}
}
-
/**
* 购买课程支付宝回调
@@ -288,7 +364,6 @@
e.printStackTrace();
}
}
-
/**
* 根据id获取课程数据
@@ -430,10 +505,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;
}
@@ -496,14 +573,12 @@
@PostMapping("/course/auditDiscount")
public Boolean auditDiscount(@RequestBody AuditDiscount auditDiscount) {
-
List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>()
.eq(TCoursePackageDiscount::getCoursePackageId, auditDiscount.getId()));
for (TCoursePackageDiscount tCoursePackageDiscount : list) {
tCoursePackageDiscount.setAuditStatus(auditDiscount.getType());
tCoursePackageDiscount.setAuditRemark(auditDiscount.getText());
}
-
return discountService.updateBatchById(list);
}
@@ -521,8 +596,6 @@
selectDto.setValue(String.valueOf(coursePackagePaymentConfig.getClassHours()));
integerList.add(selectDto);
}
-
-
return integerList;
}
@@ -530,43 +603,42 @@
public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee) {
HashMap<String, Object> map = new HashMap<>();
String data = queryDataFee.getData();
- List<Integer> ids = queryDataFee.getIds();
- if (ids.size() == 0) {
- ids.add(-1);
+ List<Integer> storeIds = queryDataFee.getIds() == null
+ ? new ArrayList<>() : new ArrayList<>(queryDataFee.getIds());
+ if (storeIds.isEmpty()) {
+ storeIds.add(-1);
}
- LambdaQueryWrapper<TCoursePackagePayment> wrapper = new LambdaQueryWrapper<>();
+ // 购课记录页使用分表 union 查询。统计也必须使用同一数据源，否则落在
+ // t_course_package_order1~5 的订单（例如测试的 0.01 元订单）不会被统计到。
+ CoursePackagePaymentQuery paymentQuery = new CoursePackagePaymentQuery();
+ paymentQuery.setStoreIds(storeIds);
+ paymentQuery.setPayStatus(2);
+ List<CoursePackagePaymentVO> list = coursePackagePaymentService.listAll(paymentQuery);
+ Date startTime = null;
+ Date endTime = null;
if (ToolUtil.isNotEmpty(data)) {
- String stime = data.split(" - ")[0] + " 00:00:00";
- String etime = data.split(" - ")[1] + " 23:59:59";
- wrapper.between(TCoursePackagePayment::getInsertTime, stime, etime);
- }
- wrapper.in(TCoursePackagePayment::getAppUserId, ids);
- wrapper.eq(TCoursePackagePayment::getPayStatus, 2);
- ArrayList<Integer> objects = new ArrayList<>();
- objects.add(1);
- objects.add(2);
- objects.add(5);
- objects.add(6);
- wrapper.in(TCoursePackagePayment::getPayType, objects);
- List<TCoursePackagePayment> list = coursePackagePaymentService.list(wrapper);
- double v = list.stream().map(TCoursePackagePayment::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
- List<Integer> collect = list.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
- if (collect.size() == 0) {
- collect.add(-1);
- }
- //
- List<TCoursePackage> list2 = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect));
- // 课类型
- List<TCoursePackageType> list1 = coursePackageTypeService.list();
-
- for (TCoursePackagePayment tCoursePackagePayment : list) {
- for (TCoursePackage tCoursePackage : list2) {
- if (tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())) {
- tCoursePackagePayment.setType(tCoursePackage.getCoursePackageTypeId());
- }
+ try {
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ startTime = formatter.parse(data.split(" - ")[0] + " 00:00:00");
+ endTime = formatter.parse(data.split(" - ")[1] + " 23:59:59");
+ } catch (Exception ignored) {
+ // 与旧实现一致：页面时间格式异常时不额外限制时间范围。
}
}
+ final Date queryStartTime = startTime;
+ final Date queryEndTime = endTime;
+ list = list.stream()
+ .filter(payment -> payment.getCashPayment() != null)
+ .filter(payment -> queryStartTime == null || payment.getInsertTime() == null
+ || (!payment.getInsertTime().before(queryStartTime)
+ && !payment.getInsertTime().after(queryEndTime)))
+ .collect(Collectors.toList());
+ double v = list.stream().map(CoursePackagePaymentVO::getCashPayment)
+ .reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
+ // 课类型
+ List<TCoursePackageType> list1 = coursePackageTypeService.list(
+ new LambdaQueryWrapper<TCoursePackageType>().ne(TCoursePackageType::getState, 3));
ArrayList<HashMap<String, Object>> hashMaps = new ArrayList<>();
@@ -574,9 +646,9 @@
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("name", tCoursePackageType.getName());
double a = 0;
- for (TCoursePackagePayment tCoursePackagePayment : list) {
- if (tCoursePackagePayment.getType().equals(tCoursePackageType.getId())) {
- a += tCoursePackagePayment.getCashPayment().doubleValue();
+ for (CoursePackagePaymentVO payment : list) {
+ if (tCoursePackageType.getId().equals(payment.getCoursePackageTypeId())) {
+ a += payment.getCashPayment().doubleValue();
}
}
objectObjectHashMap.put("value", a);
@@ -589,4 +661,53 @@
return map1;
}
+
+
+ /**
+ * 课包支付成功后排课操作
+ * @param addCoursePackageOrderStudent
+ */
+ @PostMapping("/course/addCoursePackageOrderStudent")
+ public void addCoursePackageOrderStudent(@RequestBody AddCoursePackageOrderStudent addCoursePackageOrderStudent){
+ coursePackageService.addCoursePackageOrderStudent(addCoursePackageOrderStudent.getCoursePackageOrderId(), addCoursePackageOrderStudent.getCoursePackagePaymentConfig());
+ }
+
+
+ /**
+ * 根据code获取待支付数据
+ * @param code
+ * @return
+ */
+ @PostMapping("/course/getCoursePackageOrderByCode")
+ public CoursePackageOrder getCoursePackageOrderByCode(@RequestBody String code){
+ CoursePackageOrder coursePackageOrder = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
+ .eq("code", code).eq("state", 1));
+ return coursePackageOrder;
+ }
+
+
+ /**
+ * 修改数据
+ * @param coursePackageOrder
+ */
+ @PostMapping("/course/updateCoursePackageOrder")
+ public void updateCoursePackageOrder(@RequestBody CoursePackageOrder coursePackageOrder){
+ coursePackageOrder.setAppUserId(null);
+ coursePackageOrderService.updateById(coursePackageOrder);
+ }
+
+
+ /**
+ * 获取课包配置
+ * @param getCoursePackagePaymentConfig
+ * @return
+ */
+ @PostMapping("/course/getCoursePackagePaymentConfig")
+ public CoursePackagePaymentConfig getCoursePackagePaymentConfig(@RequestBody GetCoursePackagePaymentConfig getCoursePackagePaymentConfig){
+ CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
+ .eq("coursePackageId", getCoursePackagePaymentConfig.getCoursePackageId())
+ .eq("classHours", getCoursePackagePaymentConfig.getClassHours())
+ );
+ return coursePackagePaymentConfig;
+ }
}
--
Gitblit v1.7.1