From 989783a9f80f0d2a5d66ffa7fcd3c680f461601e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 7 Jan 2025 15:51:47 +0800 Subject: [PATCH 1/9] =?UTF-8?q?orders=E8=A1=A8sys=5Fuser=5Fid=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=BF=9B=E8=A1=8C=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/orders/service/impl/OrdersServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 0a9aa4fc..b52cbffb 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 @@ -803,6 +803,6 @@ public class OrdersServiceImpl extends ServiceImpl implements if (sysUserEntity == null) { return; } - orders.setSysUserId(sysUserEntity.getSysUserId()); + orders.setSysUserId(sysUserEntity.getUserId()); } } From b8f7dbcc60b58dd8c1619cdfbe865e70b26995ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 7 Jan 2025 15:58:18 +0800 Subject: [PATCH 2/9] =?UTF-8?q?1.=E6=8F=90=E7=8E=B0=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/pay/service/impl/CashOutServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index a822b05f..e7b672b5 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -581,6 +581,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) { sysUserMoneyDetails.setContent("成功提现：" + money); cashOut.setState(1); + cashOut.setOutAt(DateUtil.date().toString()); } if (baseResp.getErrorMsg() != null) { From af691b1d089ca34b0da63436199b596fc1eb97bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 7 Jan 2025 16:03:05 +0800 Subject: [PATCH 3/9] =?UTF-8?q?1.=E6=8F=90=E7=8E=B0=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/pay/service/impl/CashOutServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index e7b672b5..f868354f 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -618,6 +618,7 @@ public class CashOutServiceImpl extends ServiceImpl impleme if (baseResp.getStatus() != null && (baseResp.getStatus().equals(2) || baseResp.getStatus().equals(10000))) { userMoneyDetails.setContent("成功提现：" + money); cashOut.setState(1); + cashOut.setOutAt(DateUtil.date().toString()); } if (baseResp.getErrorMsg() != null) { From 43c852ca541209b8a821ca3adf90b7b739475f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 7 Jan 2025 16:04:24 +0800 Subject: [PATCH 4/9] =?UTF-8?q?orders=E8=A1=A8sys=5Fuser=5Fid=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=BF=9B=E8=A1=8C=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/orders/service/impl/OrdersServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 b52cbffb..a8db67dc 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 @@ -804,5 +804,6 @@ public class OrdersServiceImpl extends ServiceImpl implements return; } orders.setSysUserId(sysUserEntity.getUserId()); + orders.setUserName(sysUserEntity.getUsername()); } } From 9a85ff85c6811c9348cf1f9d7dba2639e1130038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 7 Jan 2025 16:11:56 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempCashOutTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/job/task/TempCashOutTask.java b/src/main/java/com/sqx/modules/job/task/TempCashOutTask.java index 4b803b26..d77ee796 100644 --- a/src/main/java/com/sqx/modules/job/task/TempCashOutTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempCashOutTask.java @@ -45,7 +45,7 @@ public class TempCashOutTask{ cashOut.setRefund(null); cashOut.setOutAt(DateUtil.now()); cashOutDao.update(cashOut, new LambdaQueryWrapper().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId())); - }else if (baseResp.getStatus() != null && baseResp.getStatus().equals(3)) { + }else if (baseResp.getStatus() != null && (baseResp.getStatus().equals(3) || baseResp.getStatus().equals(99999)) ){ cashOut.setState(2); cashOutDao.update(cashOut, new LambdaQueryWrapper().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId())); } From 766e310d8d31e3d61cec561486c50ce82451ad6c Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 16:12:00 +0800 Subject: [PATCH 6/9] =?UTF-8?q?group=20by=E9=97=AE=E9=A2=98=20=E5=92=8C=20?= =?UTF-8?q?=E5=89=A7=E9=9B=86=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../course/service/impl/CourseCollectServiceImpl.java | 5 ++++- src/main/resources/mapper/course/CourseCollectDao.xml | 1 + src/main/resources/mapper/course/CourseDetailsDao.xml | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 749d1665..70fe0886 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -148,6 +148,9 @@ public class CourseCollectServiceImpl extends ServiceImpl courseDetailIds = new HashSet<>(); courses.forEach(s -> { + if (s == null) { + return; + } courseIdList.add(s.getCourseId()); courseDetailIds.add(s.getCourseDetailsId()); }); @@ -157,7 +160,7 @@ public class CourseCollectServiceImpl extends ServiceImpl courseDetails1 = courseIdList.isEmpty() ? new ArrayList<>() : courseDetailsService.list(new LambdaQueryWrapper().in(CourseDetails::getCourseDetailsId, courseDetailIds)); Map courseDetailsMap = courseDetails1.stream().collect(Collectors.toMap(CourseDetails::getCourseId, item -> item)); - List courseDetails2 = courseDetailsDao.countByCourseId(courseIdList); + List courseDetails2 = courseIdList.isEmpty() ? new ArrayList<>() : courseDetailsDao.countByCourseId(courseIdList); Map countMap = courseDetails2.stream() .collect(Collectors.toMap(CourseDetails::getCourseId, CourseDetails::getCourseDetailsCount)); diff --git a/src/main/resources/mapper/course/CourseCollectDao.xml b/src/main/resources/mapper/course/CourseCollectDao.xml index 6c57db52..d4fcaac1 100644 --- a/src/main/resources/mapper/course/CourseCollectDao.xml +++ b/src/main/resources/mapper/course/CourseCollectDao.xml @@ -49,6 +49,7 @@ FROM `course_collect` c1 WHERE c1.classify = 3 AND c1.user_id = #{userId} + group by c1.course_id order by c1.create_time desc diff --git a/src/main/resources/mapper/course/CourseDetailsDao.xml b/src/main/resources/mapper/course/CourseDetailsDao.xml index d1446b43..8192981b 100644 --- a/src/main/resources/mapper/course/CourseDetailsDao.xml +++ b/src/main/resources/mapper/course/CourseDetailsDao.xml @@ -112,7 +112,6 @@ #{ids} - GROUP BY course_id From 576ff58d63184368c51c78460d679629bb036fab Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 15:58:51 +0800 Subject: [PATCH 7/9] =?UTF-8?q?group=20by=E9=97=AE=E9=A2=98=20=E5=92=8C=20?= =?UTF-8?q?=E5=89=A7=E9=9B=86=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/course/service/impl/CourseDetailsServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java index 4ad75762..b99edaad 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java @@ -163,6 +163,10 @@ public class CourseDetailsServiceImpl extends ServiceImpl Date: Tue, 7 Jan 2025 16:20:07 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=89=A7=E7=9A=84id=20=E7=B2=BE=E5=BA=A6?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/course/entity/Course.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/sqx/modules/course/entity/Course.java b/src/main/java/com/sqx/modules/course/entity/Course.java index a4415160..63367619 100644 --- a/src/main/java/com/sqx/modules/course/entity/Course.java +++ b/src/main/java/com/sqx/modules/course/entity/Course.java @@ -329,6 +329,7 @@ public class Course implements Serializable { private String courseDetailsName; @TableField(exist = false) + @JsonSerialize(using = ToStringSerializer.class) private Long courseDetailsId; @TableField(exist = false) From 61301104b100fcb85d13c636f2992237b0e42d28 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 7 Jan 2025 16:23:52 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=A7=82=E7=9C=8B=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../course/service/impl/CourseCollectServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 70fe0886..e007b811 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -51,9 +51,13 @@ public class CourseCollectServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_id", courseCollect.getUserId()) .eq("classify", 3) @@ -103,9 +107,10 @@ public class CourseCollectServiceImpl extends ServiceImpl