parent
0a57ca9eb7
commit
0cce138a45
|
@ -16,6 +16,7 @@ public class ReqBusStoreConfigInfo {
|
|||
/** 店铺编码 */
|
||||
@ApiModelProperty(name = "店铺编码")
|
||||
private String storeCode;
|
||||
private String storeName;
|
||||
|
||||
/** 早高峰时段-方案 */
|
||||
@ApiModelProperty(name = "早高峰时段-方案")
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -40,6 +40,12 @@
|
|||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.operationStatus ==='1' " type="success">启用</el-tag>
|
||||
<el-tag v-if="scope.row.operationStatus ==='2' " type="danger">停用</el-tag>
|
||||
<el-tag v-if="scope.row.operationStatus ==='12' " type="success">自配送</el-tag>
|
||||
<el-tag v-if="scope.row.operationStatus ==='21' " type="success">正常</el-tag>
|
||||
<el-tag v-if="scope.row.operationStatus ==='13' " type="danger">正常删除</el-tag>
|
||||
<el-tag v-if="scope.row.operationStatus ==='23' " type="danger">自配送删除</el-tag>
|
||||
<el-tag v-if="scope.row.operationStatus ==='sms' " type="success">安全</el-tag>
|
||||
<el-tag v-if="scope.row.operationStatus ==='AI' " type="success">普通</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="时间" align="center" prop="updateTime" />
|
||||
|
|
|
@ -203,6 +203,7 @@
|
|||
<el-table-column label="昨日H评比(%)" 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="price" align="center" />
|
||||
<!-- <el-table-column label="归属" prop="saleBindId" align="center" :formatter="idToName" /> -->
|
||||
<el-table-column label="统计时间" align="center" prop="bindTime"/>
|
||||
<!-- <el-table-column label="营销用户下单" prop="returnVisitUserRange" align="center" /> -->
|
||||
|
|
Loading…
Reference in New Issue