From 2c70f6775cfe579a8bbad3498ccf0607ea709bf2 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Tue, 6 Aug 2024 19:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/artificer/service/impl/ArtificerServiceImpl.java    | 2 +-
 .../bl/order/service/impl/UserPackageDetailServiceImpl.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
index 4c9fe1f..8c56700 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
@@ -364,7 +364,7 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
                 }else{
                     stringBuilder.append(minuteInt);
                 }
-                ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", stringBuilder.toString()));
+                ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", stringBuilder.toString()).last("limit 1"));
                 if(artificerTime==null){
                     if(oldDate.equals(date)){
                         artificer.setTime(stringBuilder.toString());
diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java
index 39d82d3..296f1e8 100644
--- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java
+++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java
@@ -51,7 +51,7 @@ public class UserPackageDetailServiceImpl extends ServiceImpl<UserPackageDetailD
         List<UserPackageDetail> list = Lists.newArrayList();
         if(type == 105){
             list = baseMapper.findDetailUsedQuantity(userPackageDetail);
-        }else if(type == 106){
+        }else if(type == 106 || type == 114 ){
             list = baseMapper.findLcDetailUsedQuantity(userPackageDetail);
         }else{
             list = baseMapper.findDetailList(userPackageDetail);