diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreConfigInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreConfigInfo.java
index 04cc761..730d556 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreConfigInfo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreConfigInfo.java
@@ -16,6 +16,7 @@ public class ReqBusStoreConfigInfo {
/** 店铺编码 */
@ApiModelProperty(name = "店铺编码")
private String storeCode;
+ private String storeName;
/** 早高峰时段-方案 */
@ApiModelProperty(name = "早高峰时段-方案")
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/resp/RespBusStoreHistoryInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/resp/RespBusStoreHistoryInfo.java
index 03618b4..dfb2f38 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/resp/RespBusStoreHistoryInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/resp/RespBusStoreHistoryInfo.java
@@ -82,9 +82,8 @@ public class RespBusStoreHistoryInfo {
* 统计时间(创建)
*/
@Excel(name = "统计时间")
- @JSONField(ordinal = 10)
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date bindTime;
+ @JSONField(ordinal = 11)
+ private String bindTime;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java
index 1b850c4..134aa0c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java
@@ -240,7 +240,7 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService
busMarketOperationInfo.setUpdateId(loginUser.getUserId());
busMarketOperationInfo.setUpdateUser(loginUser.getUsername());
busMarketOperationInfo.setUpdateTime(DateUtils.getNowDate());
- busMarketOperationInfo.setOperationStatus(ll.get(0).getMarketingChannels()+"-"+busStoreConfigInfo.getMarketingChannels());
+ busMarketOperationInfo.setOperationStatus(busStoreConfigInfo.getMarketingChannels());
busMarketOperationInfoMapper.insertBusMarketOperationInfo(busMarketOperationInfo);
}
count = busStoreConfigInfoMapper.updateBusStoreConfigInfo(busStoreConfigInfo);
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
index 6469f23..14542be 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
@@ -169,9 +169,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sd.last_five_star_reviews_num lastFiveStarReviewsNum,
sd.last_return_visit_num lastReturnVisitNum,
ifnull(round((sd.last_positive_reviews_num/sd.last_return_visit_num)*100,2),0) as lastReturnVisitRate,
- sd.score,
- s.price,
- DATE_FORMAT(sd.create_time,'%Y-%m-%d') bindTime
+ s.price*sd.last_five_star_reviews_num as price,
+ ifnull(sd.score,'-') score,
+ #{storeBelong} bindTime
FROM bus_store_info s
LEFT JOIN bus_store_day_history_info sd ON s.id = sd.store_id and DATE_FORMAT(sd.create_time,'%Y-%m-%d') = #{storeBelong}
LEFT JOIN bus_store_config_info sc ON s.store_code = sc.store_code
@@ -213,8 +213,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sd.last_five_star_reviews_num lastFiveStarReviewsNum,
sd.last_return_visit_num lastReturnVisitNum,
ifnull(round((sd.last_positive_reviews_num/sd.last_return_visit_num)*100,2),0) as lastReturnVisitRate,
- s.price,
- sd.score,
+ ifnull(sd.score,'-') score,
s.bind_time bindTime,
CONCAT(sc.min_order_num,'~',sc.max_order_num) returnVisitUserRange,
CASE s.self_delivery_status
@@ -255,9 +254,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sd.last_five_star_reviews_num lastFiveStarReviewsNum,
sd.last_return_visit_num lastReturnVisitNum,
ifnull(round((sd.last_positive_reviews_num/sd.last_return_visit_num)*100,2),0) as lastReturnVisitRate,
- s.price,
- sd.score,
- DATE_FORMAT(sd.create_time,'%Y-%m-%d') bindTime
+ s.price*sd.last_five_star_reviews_num as price,
+ ifnull(sd.score,'-')score,
+ #{storeBelong} bindTime
FROM bus_store_info s
LEFT JOIN bus_store_day_history_info sd ON s.id = sd.store_id and DATE_FORMAT(sd.create_time,'%Y-%m-%d') = #{storeBelong}
LEFT JOIN bus_store_config_info sc ON s.store_code = sc.store_code
diff --git a/ruoyi-ui/src/views/statistics/operation/index.vue b/ruoyi-ui/src/views/statistics/operation/index.vue
index 498d59b..86ccbbb 100644
--- a/ruoyi-ui/src/views/statistics/operation/index.vue
+++ b/ruoyi-ui/src/views/statistics/operation/index.vue
@@ -40,6 +40,12 @@
启用
停用
+ 自配送
+ 正常
+ 正常删除
+ 自配送删除
+ 安全
+ 普通
diff --git a/ruoyi-ui/src/views/statistics/shop/index.vue b/ruoyi-ui/src/views/statistics/shop/index.vue
index ac93b3a..44efb19 100644
--- a/ruoyi-ui/src/views/statistics/shop/index.vue
+++ b/ruoyi-ui/src/views/statistics/shop/index.vue
@@ -203,6 +203,7 @@
+