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 ad50a83..5b42559 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
@@ -11,6 +11,7 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -151,7 +152,13 @@ public class RyTask {
                 }
             } else continue;
             // 配置规则
-            List<BusOrderInfo> list = orderInfoService.selectBusOrderInfoListToAi(busStoreInfo.getStoreCode(),t1, t2);
+            List<BusOrderInfo> list = new ArrayList<>();
+            if("1".equals(busStoreInfo.getSelfDeliveryStatus())){
+                list = orderInfoService.selectBusOrderInfoListToAi(busStoreInfo.getStoreCode(),t1, t2);
+            }else if("2".equals(busStoreInfo.getSelfDeliveryStatus())){
+                // 自配送前推时间处理
+                list = orderInfoService.selectBusOrderInfoListToAi(busStoreInfo.getStoreCode(),t1, t2);
+            }
 //            list.forEach(System.out::println);
             BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo();
             busStoreConfigInfo.setStoreCode(busStoreInfo.getStoreCode());
diff --git a/ruoyi-ui/src/views/market/self/index.vue b/ruoyi-ui/src/views/market/self/index.vue
index 36e772e..0803ae0 100644
--- a/ruoyi-ui/src/views/market/self/index.vue
+++ b/ruoyi-ui/src/views/market/self/index.vue
@@ -146,33 +146,33 @@
     <el-table v-loading="loading" :data="storeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" ></el-table-column>
-      <el-table-column label="平台" prop="platformType" >
+      <el-table-column label="平台" prop="platformType" width="55">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
         </template>
       </el-table-column>
-      <el-table-column label="编码" prop="storeCode" :show-overflow-tooltip="true"  />
-      <el-table-column label="名称" prop="storeName" :show-overflow-tooltip="true"  />
-      <el-table-column label="在线状态" prop ="grantStatus" align="center" >
+      <el-table-column label="编号" prop="storeCode" :show-overflow-tooltip="true"  width="55" align="center" />
+      <el-table-column label="名称" prop="storeName" :show-overflow-tooltip="true"  align="center" />
+      <el-table-column label="在线状态" prop ="grantStatus" align="center"  width="75" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_grant_status" :value="scope.row.grantStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="昨日单量" prop="lastOrderNum" align="center" />
-      <el-table-column label="昨日好评量" prop="lastPositiveReviewsNum" align="center" />
-      <el-table-column label="昨日五星量" prop="lastFiveStarReviewsNum" align="center" />
-      <el-table-column label="昨日回访量" prop="lastReturnVisitNum" align="center" />
-      <el-table-column label="昨日营销比(%)" prop="lastReturnVisitRate" align="center" :render-header="renderPrice"/>
-      <el-table-column label="今日回访量" prop="todayReturnVisitNum" align="center" />
-      <el-table-column label="评分" prop="score" align="center" />
-      <el-table-column label="归属" prop="saleBindId" align="center"  :formatter="idToName"/>
-      <el-table-column label="创建时间" align="center" prop="bindTime" width="180">
+      <el-table-column label="昨日单量" prop="lastOrderNum" align="center"  width="75"/>
+      <el-table-column label="昨日好评量" prop="lastPositiveReviewsNum" align="center"  width="85"/>
+      <el-table-column label="昨日五星量" prop="lastFiveStarReviewsNum" align="center"  width="85"/>
+      <el-table-column label="昨日回访量" prop="lastReturnVisitNum" align="center"  width="85"/>
+      <el-table-column label="昨日营销比(%)" prop="lastReturnVisitRate" align="center" :render-header="renderPrice"  width="120" />
+      <el-table-column label="今日回访量" prop="todayReturnVisitNum" align="center" width="85" />
+      <el-table-column label="评分" prop="score" align="center"  width="55" />
+      <el-table-column label="归属" prop="saleBindId" align="center"  :formatter="idToName"  width="65" />
+      <el-table-column label="创建时间" align="center" prop="bindTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bindTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="营销用户下单" prop="returnVisitUserRange" align="center" />
-      <el-table-column label="是否开启" prop="returnVisitStatus" align="center" >
+      <el-table-column label="营销用户下单" prop="returnVisitUserRange" align="center" width="110" />
+      <el-table-column label="是否开启" prop="returnVisitStatus" align="center" width="85" >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.returnVisitStatus"
@@ -247,7 +247,7 @@
               />
             </el-select>
         </el-form-item>
-        <el-form-item label="晚高峰时段-方案" prop="content3">
+        <el-form-item label="下午时段-方案" prop="content3">
           <el-select
               v-model="form.content3"
               placeholder="选择话术"
@@ -262,7 +262,7 @@
               />
             </el-select>
         </el-form-item>
-        <el-form-item label="默认时间段-方案" prop="content4">
+        <el-form-item label="晚高峰时段-方案" prop="content4">
           <el-select
               v-model="form.content4"
               placeholder="选择话术"
diff --git a/ruoyi-ui/src/views/market/whole/index.vue b/ruoyi-ui/src/views/market/whole/index.vue
index b78ffc7..e3c7150 100644
--- a/ruoyi-ui/src/views/market/whole/index.vue
+++ b/ruoyi-ui/src/views/market/whole/index.vue
@@ -153,33 +153,33 @@
     <el-table v-loading="loading" :data="storeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" ></el-table-column>
-      <el-table-column label="平台" prop="platformType" >
+      <el-table-column label="平台" prop="platformType" width="55">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
         </template>
       </el-table-column>
-      <el-table-column label="编码" prop="storeCode" :show-overflow-tooltip="true"  />
-      <el-table-column label="名称" prop="storeName" :show-overflow-tooltip="true"  />
-      <el-table-column label="在线状态" prop ="grantStatus" align="center" >
+      <el-table-column label="编号" prop="storeCode" :show-overflow-tooltip="true"  width="55" align="center" />
+      <el-table-column label="名称" prop="storeName" :show-overflow-tooltip="true"  align="center" />
+      <el-table-column label="在线状态" prop ="grantStatus" align="center"  width="75" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_grant_status" :value="scope.row.grantStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="昨日单量" prop="lastOrderNum" align="center" />
-      <el-table-column label="昨日好评量" prop="lastPositiveReviewsNum" align="center" />
-      <el-table-column label="昨日五星量" prop="lastFiveStarReviewsNum" align="center" />
-      <el-table-column label="昨日回访量" prop="lastReturnVisitNum" align="center" />
-      <el-table-column label="昨日营销比(%)" prop="lastReturnVisitRate" align="center" :render-header="renderPrice"/>
-      <el-table-column label="今日回访量" prop="todayReturnVisitNum" align="center" />
-      <el-table-column label="评分" prop="score" align="center" />
-      <el-table-column label="归属" prop="saleBindId" align="center"  :formatter="idToName"/>
-      <el-table-column label="创建时间" align="center" prop="bindTime" width="180">
+      <el-table-column label="昨日单量" prop="lastOrderNum" align="center"  width="75"/>
+      <el-table-column label="昨日好评量" prop="lastPositiveReviewsNum" align="center"  width="85"/>
+      <el-table-column label="昨日五星量" prop="lastFiveStarReviewsNum" align="center"  width="85"/>
+      <el-table-column label="昨日回访量" prop="lastReturnVisitNum" align="center"  width="85"/>
+      <el-table-column label="昨日营销比(%)" prop="lastReturnVisitRate" align="center" :render-header="renderPrice"  width="120" />
+      <el-table-column label="今日回访量" prop="todayReturnVisitNum" align="center" width="85" />
+      <el-table-column label="评分" prop="score" align="center"  width="55" />
+      <el-table-column label="归属" prop="saleBindId" align="center"  :formatter="idToName"  width="65" />
+      <el-table-column label="创建时间" align="center" prop="bindTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bindTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="营销用户下单" prop="returnVisitUserRange" align="center" />
-      <el-table-column label="是否开启" prop="returnVisitStatus" align="center" >
+      <el-table-column label="营销用户下单" prop="returnVisitUserRange" align="center" width="110" />
+      <el-table-column label="是否开启" prop="returnVisitStatus" align="center" width="85" >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.returnVisitStatus"
diff --git a/ruoyi-ui/src/views/statistics/shop/index.vue b/ruoyi-ui/src/views/statistics/shop/index.vue
index 4331da6..747dd83 100644
--- a/ruoyi-ui/src/views/statistics/shop/index.vue
+++ b/ruoyi-ui/src/views/statistics/shop/index.vue
@@ -146,33 +146,33 @@
     <el-table v-loading="loading" :data="storeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" ></el-table-column>
-      <el-table-column label="平台" prop="platformType" >
+      <el-table-column label="平台" prop="platformType" width="55">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
         </template>
       </el-table-column>
-      <el-table-column label="编码" prop="storeCode" :show-overflow-tooltip="true"  />
-      <el-table-column label="名称" prop="storeName" :show-overflow-tooltip="true"  />
-      <el-table-column label="在线状态" prop ="grantStatus" align="center" >
+      <el-table-column label="编号" prop="storeCode" :show-overflow-tooltip="true"  width="55" align="center" />
+      <el-table-column label="名称" prop="storeName" :show-overflow-tooltip="true"  align="center" />
+      <el-table-column label="在线状态" prop ="grantStatus" align="center"  width="75" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_grant_status" :value="scope.row.grantStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="昨日单量" prop="lastOrderNum" align="center" />
-      <el-table-column label="昨日好评量" prop="lastPositiveReviewsNum" align="center" />
-      <el-table-column label="昨日五星量" prop="lastFiveStarReviewsNum" align="center" />
-      <el-table-column label="昨日回访量" prop="lastReturnVisitNum" align="center" />
-      <el-table-column label="昨日营销比(%)" prop="lastReturnVisitRate" align="center" :render-header="renderPrice"/>
-      <el-table-column label="今日回访量" prop="todayReturnVisitNum" align="center" />
-      <el-table-column label="评分" prop="score" align="center" />
-      <el-table-column label="归属" prop="saleBindId" align="center"  :formatter="idToName"/>
-      <el-table-column label="创建时间" align="center" prop="bindTime" width="180">
+      <el-table-column label="昨日单量" prop="lastOrderNum" align="center"  width="75"/>
+      <el-table-column label="昨日好评量" prop="lastPositiveReviewsNum" align="center"  width="85"/>
+      <el-table-column label="昨日五星量" prop="lastFiveStarReviewsNum" align="center"  width="85"/>
+      <el-table-column label="昨日回访量" prop="lastReturnVisitNum" align="center"  width="85"/>
+      <el-table-column label="昨日营销比(%)" prop="lastReturnVisitRate" align="center" :render-header="renderPrice"  width="120" />
+      <el-table-column label="今日回访量" prop="todayReturnVisitNum" align="center" width="85" />
+      <el-table-column label="评分" prop="score" align="center"  width="55" />
+      <el-table-column label="归属" prop="saleBindId" align="center"  :formatter="idToName"  width="65" />
+      <el-table-column label="创建时间" align="center" prop="bindTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bindTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="营销用户下单" prop="returnVisitUserRange" align="center" />
-      <el-table-column label="是否开启" prop="returnVisitStatus" align="center" >
+      <el-table-column label="营销用户下单" prop="returnVisitUserRange" align="center" width="110" />
+      <el-table-column label="是否开启" prop="returnVisitStatus" align="center" width="85" >
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.returnVisitStatus"