From a0fb0b4ea084b34ef6c6b971b0c462a32b848b48 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Sat, 14 Sep 2024 10:15:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=AE=A2=E6=9C=8D=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7=E7=9A=84=E6=9C=80=E5=90=8E?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E8=AE=A2=E5=8D=95=E7=9A=84=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/AppVerifyController.java   | 28 +++++++++++++++++++
 .../ruoyi/system/mapper/EtOrderMapper.java    |  5 ++++
 .../ruoyi/system/service/IEtOrderService.java |  5 ++++
 .../service/impl/EtOrderServiceImpl.java      |  9 ++++++
 .../resources/mapper/system/EtOrderMapper.xml | 10 +++++++
 5 files changed, 57 insertions(+)

diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
index 0b2942b..980e10a 100644
--- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
+++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java
@@ -1450,4 +1450,32 @@ public class AppVerifyController extends BaseController
         }
         return toAjax(1);
     }
+
+    /**
+     * 根据用户获取最后一个订单所属的运营区客服电话  latestServicePhone
+     *  1. 查询用户
+     *  2. 最后一个订单
+     *  3. 查询订单所属运营区
+     *  4. 查询运营区客服电话
+     */
+    @Log(title = "", businessType = BusinessType.ZEROORDER)
+    @GetMapping("/latestServicePhone")
+    public AjaxResult latestServicePhone(Long userId)
+    {
+        logger.info("根据用户获取最后一个订单所属的运营区客服电话：【userId="+userId+"】");
+        if (ObjectUtil.isNull(userId)){
+            throw new ServiceException("未传userId");
+        }
+        EtOrder etOrder =new EtOrder();
+        etOrder.setUserId(userId);
+        EtOrder etOrder1 = etOrderService.latestOrder2(etOrder);
+        if(ObjectUtil.isNotNull(etOrder1)){
+            EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(etOrder1.getAreaId());
+            if(ObjectUtil.isNull(area)){
+                return error("未查询到运营区域信息");
+            }
+            return success(area);
+        }
+        return error();
+    }
 }
diff --git a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java
index b3bc295..45c3203 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/mapper/EtOrderMapper.java
@@ -258,6 +258,11 @@ public interface EtOrderMapper
      */
     EtOrder selectLatestOrder(EtOrder etOrder);
 
+    /**
+     * 最近一笔订单（包含押金订单）
+     */
+    EtOrder selectLatestOrder2(EtOrder etOrder);
+
     /**
      * 最近一笔订单
      */
diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java b/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java
index cf58abc..18713c4 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/IEtOrderService.java
@@ -159,6 +159,11 @@ public interface IEtOrderService
      */
     EtOrder latestOrder(EtOrder etOrder);
 
+    /**
+     * 最近一笔订单（包含押金订单）
+     */
+    EtOrder latestOrder2(EtOrder etOrder);
+
     /**
      * 订单退款
      */
diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
index 6748a78..b01ffee 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
@@ -1709,6 +1709,15 @@ public class EtOrderServiceImpl implements IEtOrderService
         return order;
     }
 
+    /**
+     * 最近一笔订单
+     */
+    @Override
+    public EtOrder latestOrder2(EtOrder etOrder) {
+        EtOrder order = etOrderMapper.selectLatestOrder2(etOrder);
+        return order;
+    }
+
     /**
      * 退款
      */
diff --git a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
index 57211e5..a7194d3 100644
--- a/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtOrderMapper.xml
@@ -727,6 +727,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LIMIT 1
     </select>
 
+    <select id="selectLatestOrder2" resultMap="EtOrderResult">
+        <include refid="selectEtOrderVoNoRoute"/>
+        <where>
+            <if test="userId != null"> and user_id = #{userId}</if>
+            <if test="sn != null"> and sn = #{sn}</if>
+        </where>
+        ORDER BY create_time DESC
+        LIMIT 1
+    </select>
+
     <select id="selectLatestOrderList" resultMap="EtOrderResult">
         SELECT o.*,u.phonenumber,u.real_name realName
         FROM et_order o