From fc5811117add9b740b171de0c9c26a8d1b80e175 Mon Sep 17 00:00:00 2001
From: Lenovo <zhuacang@163.com>
Date: Wed, 10 Jul 2024 17:48:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/business/controller/BusBanOperateController.java  | 2 +-
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java    | 2 +-
 .../src/main/resources/mapper/business/BusStoreInfoMapper.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusBanOperateController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusBanOperateController.java
index a6fea01..41b2402 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusBanOperateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusBanOperateController.java
@@ -92,7 +92,7 @@ public class BusBanOperateController extends BaseController
             BusOrderInfo busOrderInfo = iBusOrderInfoService.selectBusOrderInfoById(orderId);
             busBanOperateInfo.setStoreCode(busOrderInfo.getStoreCode());
             busBanOperateInfo.setStoreName(busOrderInfo.getStoreName());
-            busBanOperateInfo.setBanOperateCode(busOrderInfo.getOrderNo());
+            busBanOperateInfo.setBanOperateCode(busOrderInfo.getCustomId());
             busBanOperateInfo.setBindOrderCode(busOrderInfo.getId()+"");
             busBanOperateInfoList.add(busBanOperateInfo);
         }
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index dd7de63..fb9b4c0 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -200,7 +200,7 @@ public class RyTask {
 
                 //加入免运营订单-黑名单的 不营销跳出
                 BusBanOperateInfo busBanOperateInfo = new BusBanOperateInfo();
-                busBanOperateInfo.setBindOrderCode(busOrderInfo.getId()+"");
+                busBanOperateInfo.setBanOperateCode(busOrderInfo.getCustomId());
                 busBanOperateInfo.setBanStatus("1");
                 List<BusBanOperateInfo> list1 = iBusBanOperateInfoService.selectBusBanOperateInfoList(busBanOperateInfo);
                 if(list1.size() > 0){
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
index 03a4567..dc4aeba 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="lastUserIntegralNum" parameterType="java.lang.String" resultType="java.lang.Integer">
         select count(integral_update_num) from bus_integral_record
         where account = #{agentAccount} and update_type = '消耗账分'
-          and internal_update_time between #{startTime} and #{endTime}
+          and integral_update_time between #{startTime} and #{endTime}
     </select>
 
     <select id="selectBusStoreInfoList" parameterType="BusStoreInfo" resultMap="BusStoreInfoResult">