From c8abc25e839fafe763c5fb280009335c7dcec963 Mon Sep 17 00:00:00 2001
From: hly <2783385703@qq.com>
Date: Mon, 25 Aug 2025 18:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contoller/ApiAppletHhrWorkOutController.java   |  1 +
 .../impl/AApiAppletHhrWorkOutServiceImpl.java      | 29 +++++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java
index 3dab594..fb1a769 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java
@@ -132,6 +132,7 @@ public class ApiAppletHhrWorkOutController {
             //查询最近下单时间
             Order order = orderMapper.selectOne(Wrappers.<Order>lambdaQuery()
                     .select(Order::getCreateTime)
+                    .eq(Order::getMemberId, member.getId())
                     .orderByDesc(Order::getCreateTime)
                     .last("limit 1"));
             memberExtendVo.setOrderTime(order.getCreateTime());
diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletHhrWorkOutServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletHhrWorkOutServiceImpl.java
index a20f3ba..82623b0 100644
--- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletHhrWorkOutServiceImpl.java
+++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletHhrWorkOutServiceImpl.java
@@ -70,14 +70,35 @@ public class AApiAppletHhrWorkOutServiceImpl implements IAApiAppletHhrWorkOutSer
         Map<String,Object> map = new HashMap<>();
         map.put("info",appUsers); //用户信息
 
-        // 计算合伙人入住天数
-        long partnerDays = 0;
+        // 计算合伙人入住时间
+        String partnerTime = "0分钟";
         if (appUsers.getCreateTime() != null) {
             LocalDateTime createTime = appUsers.getCreateTime();
             LocalDateTime now = LocalDateTime.now();
-            partnerDays = ChronoUnit.DAYS.between(createTime, now);
+            long days = ChronoUnit.DAYS.between(createTime, now);
+            
+            if (days > 0) {
+                partnerTime = days + "天";
+            } else {
+                long hours = ChronoUnit.HOURS.between(createTime, now);
+                if (hours > 0) {
+                    partnerTime = hours + "小时";
+                } else {
+                    long minutes = ChronoUnit.MINUTES.between(createTime, now);
+                    if (minutes > 0) {
+                        partnerTime = minutes + "分钟";
+                    } else {
+                        long seconds = ChronoUnit.SECONDS.between(createTime, now);
+                        if (seconds > 0) {
+                            partnerTime = seconds + "秒";
+                        } else {
+                            partnerTime = "刚刚加入";
+                        }
+                    }
+                }
+            }
         }
-        map.put("partner_day", partnerDays + "天"); //合伙人加入天数
+        map.put("partner_day", partnerTime); //合伙人加入时间
 
         AppletConfig petPaymentHh = appletConfigService.selectAppletConfigByClassAndNum("pet_payment_hh", appUsers.getUserHhRole());