From 20d8754791fc34559aae26a003d185aa610f5bb6 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Wed, 24 Jul 2024 21:28:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=83=E6=8E=89=E7=9A=84=E5=8D=95=E5=AD=90?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=B0=E5=9B=9E=E8=AE=BF=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/business/domain/BusReturnVisitInfo.java    | 9 +++++++++
 .../com/ruoyi/business/service/impl/AiServiceImpl.java   | 5 +++--
 .../mapper/business/BusReturnVisitInfoMapper.xml         | 1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusReturnVisitInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusReturnVisitInfo.java
index 5ef6f06..d135f8d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusReturnVisitInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusReturnVisitInfo.java
@@ -62,6 +62,15 @@ public class BusReturnVisitInfo extends BaseEntity
     private Date finishTime;
     private String beginTime;
     private String endTime;
+    private String isCharging;
+
+    public String getIsCharging() {
+        return isCharging;
+    }
+
+    public void setIsCharging(String isCharging) {
+        this.isCharging = isCharging;
+    }
 
     public String getBeginTime() {
         return beginTime;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java
index 264ce56..77612a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java
@@ -365,6 +365,8 @@ public class AiServiceImpl implements IAiService {
                 if (list1.size() > 0) {
                     continue;
                 }
+                BusReturnVisitInfo returnVisitInfo = new BusReturnVisitInfo();
+                returnVisitInfo.setPhoneNumber(busOrderInfo.getPrivcyPhone());
 //                redisTemplate.opsForValue().set(busStoreConfigInfo.getStoreCode() + now.format(dateTimeFormatterNow), quota + "");
                 BusFifteenInfo fifteenInfo = new BusFifteenInfo();
                 fifteenInfo.setCustomId(busOrderInfo.getCustomId());
@@ -405,9 +407,8 @@ public class AiServiceImpl implements IAiService {
                     record.setIntegralUpdateNum(a);
                     record.setIntegralBalance(reduce);
                     integralRecordService.insertBusIntegralRecord(record);
+                    returnVisitInfo.setIsCharging("1");
                 }
-                BusReturnVisitInfo returnVisitInfo = new BusReturnVisitInfo();
-                returnVisitInfo.setPhoneNumber(busOrderInfo.getPrivcyPhone());
                 List<BusReturnVisitInfo> list2 = busReturnVisitInfoMapper.selectBusReturnVisitInfoList(returnVisitInfo);
                 if (list2.size() > 0) {
                     returnVisitInfo.setId(list2.get(0).getId());
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml
index a58cd90..9abb840 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml
@@ -109,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="returnVisitTime != null">return_visit_time = #{returnVisitTime},</if>
             <if test="finishTime != null">finish_time = #{finishTime},</if>
             <if test="orderCompleteTime != null">order_complete_time = #{orderCompleteTime},</if>
+            <if test="isCharging != null">is_charging = #{isCharging},</if>
         </trim>
         where id = #{id}
     </update>