From a0270d2d70497ce4a0ddcf1e7d27eb822b6694c6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 17:06:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java | 3 ++-
manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java b/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
index def8b25..a2dba27 100644
--- a/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
+++ b/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
@@ -67,7 +67,8 @@
TLineUp lineUp = tLineUpService.getOne(Wrappers.lambdaQuery(TLineUp.class)
.eq(TLineUp::getUserId, userId)
.eq(TLineUp::getStoreId, storeId)
- .likeRight(TLineUp::getCreateTime, LocalDate.now())
+ .eq(TLineUp::getStatus, 1)
+ .orderByDesc(TLineUp::getCreateTime)
.last("LIMIT 1"));
TLineUpVO tLineUpVO = new TLineUpVO();
BeanUtils.copyProperties(lineUp, tLineUpVO);
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
index fa2d359..5da3b88 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
@@ -85,7 +85,7 @@
BeanUtils.copyProperties(byId,res);
res.setOrderId(byId1.getId());
if (byId1.getUserId()!=null){
- TAppUser byId4 = appUserService.getById(byId1);
+ TAppUser byId4 = appUserService.getById(byId1.getUserId());
if (byId4!=null){
res.setPhone(byId4.getPhone());
res.setName(byId4.getName());
--
Gitblit v1.7.1