From 8542e94ed98193fe111ed51f0139c8c9ee01e09d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 25 Dec 2024 15:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20=E9=A2=86=E5=A5=96=20=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/orders/service/impl/OrdersServiceImpl.java | 4 ++++ .../taskCenter/controller/TaskCenterRewardController.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index 8fc39199..d1d68ae2 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -244,6 +244,10 @@ public class OrdersServiceImpl extends ServiceImpl implements log.info("生成商品订单信息接口入参为：{},{}", courseId, userId); reentrantReadWriteLock.writeLock().lock(); try { + CourseDetails courseDetail = courseDetailsService.getById(courseDetailsId); + if (courseDetail != null && courseDetail.getIsPrice().equals(2)) { + return Result.success().put("status", 1); + } CourseUser courseUser1 = courseUserDao.selectCourseUser(courseId, userId); if (courseUser1 != null) { return Result.success().put("status", 1); diff --git a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java index 6b537923..2fac05a4 100644 --- a/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java +++ b/src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterRewardController.java @@ -98,7 +98,8 @@ public class TaskCenterRewardController { .eq("task_id", taskId) .gt("create_time", DateUtil.beginOfMonth(new Date()) + " 00:00:00")); if (record != null) { - map.put("receive", record.getId()); + map.put("receive", record.getSourceId()); + map.put("record", record.getId()); } map.put("data", list); return Result.success(map);