测试2
This commit is contained in:
parent
60a4d72c9c
commit
dee35b4ac1
|
@ -1,17 +1,19 @@
|
|||
TRUNCATE TABLE bus_agent_info;
|
||||
TRUNCATE TABLE bus_ai_info;
|
||||
TRUNCATE TABLE bus_ban_operate_info;
|
||||
TRUNCATE TABLE bus_fifteen_info;
|
||||
TRUNCATE TABLE bus_integral_record;
|
||||
TRUNCATE TABLE bus_market_operation_info;
|
||||
TRUNCATE TABLE bus_order_info;
|
||||
TRUNCATE TABLE bus_return_visit_info;
|
||||
TRUNCATE TABLE bus_sale_info;
|
||||
TRUNCATE TABLE bus_store_config_info;
|
||||
TRUNCATE TABLE bus_store_day_info;
|
||||
TRUNCATE TABLE bus_store_day_history_info;
|
||||
TRUNCATE TABLE bus_store_info;
|
||||
TRUNCATE TABLE sys_job_log;
|
||||
TRUNCATE TABLE sys_logininfor;
|
||||
TRUNCATE TABLE sys_oper_log;
|
||||
TRUNCATE TABLE bus_agent_info;
|
||||
|
||||
DELETE
|
||||
FROM
|
||||
|
|
|
@ -119,11 +119,11 @@ public class BusStoreInfoController extends BaseController {
|
|||
BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
|
||||
busStoreDayInfo.setStoreId(info.getId());
|
||||
List<BusStoreDayInfo> ll = busStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo);
|
||||
int a = ll.get(0).getLastOrderNum();
|
||||
int a = ll.get(0).getLastPositiveReviewsNum();
|
||||
int b = ll.get(0).getLastReturnVisitNum();
|
||||
info.setLastOrderNum(a);
|
||||
info.setLastOrderNum(ll.get(0).getLastOrderNum());
|
||||
info.setLastReturnVisitNum(b);
|
||||
info.setLastPositiveReviewsNum(ll.get(0).getLastPositiveReviewsNum());
|
||||
info.setLastPositiveReviewsNum(a);
|
||||
info.setLastFiveStarReviewsNum(ll.get(0).getLastFiveStarReviewsNum());
|
||||
// String date = LocalDateTime.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
||||
// List<BusReturnVisitInfo> llll = iBusReturnVisitInfoService.selectBusReturnVisitInfoListByDate(busStoreInfo1.getStoreCode(),date);
|
||||
|
@ -131,7 +131,7 @@ public class BusStoreInfoController extends BaseController {
|
|||
info.setScore(ll.get(0).getScore());
|
||||
if (a != 0 && b != 0) {
|
||||
java.text.DecimalFormat df = new java.text.DecimalFormat("0.00");
|
||||
String formattedResult = df.format(((double) b / a)*100);
|
||||
String formattedResult = df.format(((double) a / b)*100);
|
||||
info.setLastReturnVisitRate(formattedResult);
|
||||
} else {
|
||||
info.setLastReturnVisitRate("0");
|
||||
|
|
|
@ -20,36 +20,36 @@ public class RyTask {
|
|||
@Autowired
|
||||
private IBusFifteenInfoService iBusFifteenInfoService;
|
||||
|
||||
// /**
|
||||
// * 获取订单并解析号码 5分钟
|
||||
// */
|
||||
// public void getOrders() {
|
||||
// iMeituanService.orderInfoList();
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 发送AI 1分钟
|
||||
// *
|
||||
// * @throws Exception
|
||||
// */
|
||||
// public void sendToAi() throws Exception {
|
||||
// aiService.sendToAi();
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 获取AI结果 5分钟
|
||||
// */
|
||||
// public void getAiResult() {
|
||||
// aiService.queryAiTask();
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 统计昨日营销数 每天8点执行一次
|
||||
// */
|
||||
// public void getReturnInfo() {
|
||||
// iMeituanService.getReturnInfo();
|
||||
//
|
||||
// }
|
||||
/**
|
||||
* 获取订单并解析号码 5分钟
|
||||
*/
|
||||
public void getOrders() {
|
||||
iMeituanService.orderInfoList();
|
||||
}
|
||||
|
||||
/**
|
||||
* 发送AI 1分钟
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public void sendToAi() throws Exception {
|
||||
aiService.sendToAi();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取AI结果 5分钟
|
||||
*/
|
||||
public void getAiResult() {
|
||||
aiService.queryAiTask();
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计昨日营销数 每天8点执行一次
|
||||
*/
|
||||
public void getReturnInfo() {
|
||||
iMeituanService.getReturnInfo();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理表 15天前数据
|
||||
|
|
|
@ -0,0 +1,93 @@
|
|||
package com.ruoyi.business.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 模版属性对象 bus_template_attr_config
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2024-07-16
|
||||
*/
|
||||
public class BusTemplateAttrConfig extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** $column.columnComment */
|
||||
private Long id;
|
||||
|
||||
/** 模版类型 */
|
||||
@Excel(name = "模版类型")
|
||||
private String templateType;
|
||||
|
||||
/** 属性名 */
|
||||
@Excel(name = "属性名")
|
||||
private String attrName;
|
||||
|
||||
/** 属性状态 */
|
||||
@Excel(name = "属性状态")
|
||||
private String attrStatus;
|
||||
|
||||
/** 原始排序 */
|
||||
@Excel(name = "原始排序")
|
||||
private Long attrSort;
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setTemplateType(String templateType)
|
||||
{
|
||||
this.templateType = templateType;
|
||||
}
|
||||
|
||||
public String getTemplateType()
|
||||
{
|
||||
return templateType;
|
||||
}
|
||||
public void setAttrName(String attrName)
|
||||
{
|
||||
this.attrName = attrName;
|
||||
}
|
||||
|
||||
public String getAttrName()
|
||||
{
|
||||
return attrName;
|
||||
}
|
||||
public void setAttrStatus(String attrStatus)
|
||||
{
|
||||
this.attrStatus = attrStatus;
|
||||
}
|
||||
|
||||
public String getAttrStatus()
|
||||
{
|
||||
return attrStatus;
|
||||
}
|
||||
public void setAttrSort(Long attrSort)
|
||||
{
|
||||
this.attrSort = attrSort;
|
||||
}
|
||||
|
||||
public Long getAttrSort()
|
||||
{
|
||||
return attrSort;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("templateType", getTemplateType())
|
||||
.append("attrName", getAttrName())
|
||||
.append("attrStatus", getAttrStatus())
|
||||
.append("attrSort", getAttrSort())
|
||||
.toString();
|
||||
}
|
||||
}
|
|
@ -0,0 +1,121 @@
|
|||
package com.ruoyi.business.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 模版属性键值对象 bus_template_attr_info
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2024-07-16
|
||||
*/
|
||||
public class BusTemplateAttrInfo extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** $column.columnComment */
|
||||
private Long id;
|
||||
|
||||
/** 模版id */
|
||||
@Excel(name = "模版id")
|
||||
private Long templateId;
|
||||
|
||||
/** 属性id */
|
||||
@Excel(name = "属性id")
|
||||
private Long attrId;
|
||||
|
||||
/** 属性名 */
|
||||
@Excel(name = "属性名")
|
||||
private String attrName;
|
||||
|
||||
/** 属性值 */
|
||||
@Excel(name = "属性值")
|
||||
private String attrValue;
|
||||
|
||||
/** 属性状态 */
|
||||
@Excel(name = "属性状态")
|
||||
private String attrStatus;
|
||||
|
||||
/** 排序 */
|
||||
@Excel(name = "排序")
|
||||
private Long attrSort;
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setTemplateId(Long templateId)
|
||||
{
|
||||
this.templateId = templateId;
|
||||
}
|
||||
|
||||
public Long getTemplateId()
|
||||
{
|
||||
return templateId;
|
||||
}
|
||||
public void setAttrId(Long attrId)
|
||||
{
|
||||
this.attrId = attrId;
|
||||
}
|
||||
|
||||
public Long getAttrId()
|
||||
{
|
||||
return attrId;
|
||||
}
|
||||
public void setAttrName(String attrName)
|
||||
{
|
||||
this.attrName = attrName;
|
||||
}
|
||||
|
||||
public String getAttrName()
|
||||
{
|
||||
return attrName;
|
||||
}
|
||||
public void setAttrValue(String attrValue)
|
||||
{
|
||||
this.attrValue = attrValue;
|
||||
}
|
||||
|
||||
public String getAttrValue()
|
||||
{
|
||||
return attrValue;
|
||||
}
|
||||
public void setAttrStatus(String attrStatus)
|
||||
{
|
||||
this.attrStatus = attrStatus;
|
||||
}
|
||||
|
||||
public String getAttrStatus()
|
||||
{
|
||||
return attrStatus;
|
||||
}
|
||||
public void setAttrSort(Long attrSort)
|
||||
{
|
||||
this.attrSort = attrSort;
|
||||
}
|
||||
|
||||
public Long getAttrSort()
|
||||
{
|
||||
return attrSort;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("templateId", getTemplateId())
|
||||
.append("attrId", getAttrId())
|
||||
.append("attrName", getAttrName())
|
||||
.append("attrValue", getAttrValue())
|
||||
.append("attrStatus", getAttrStatus())
|
||||
.append("attrSort", getAttrSort())
|
||||
.toString();
|
||||
}
|
||||
}
|
|
@ -0,0 +1,165 @@
|
|||
package com.ruoyi.business.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 模版对象 bus_template_info
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2024-07-16
|
||||
*/
|
||||
public class BusTemplateInfo extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** $column.columnComment */
|
||||
private Long id;
|
||||
|
||||
/** 模版名称 */
|
||||
@Excel(name = "模版名称")
|
||||
private String templateName;
|
||||
|
||||
/** 模版类型 word excel */
|
||||
@Excel(name = "模版类型 word excel")
|
||||
private String templateType;
|
||||
|
||||
/** 内容 */
|
||||
@Excel(name = "内容")
|
||||
private String templateContent;
|
||||
|
||||
/** 1启用 2弃用 */
|
||||
@Excel(name = "1启用 2弃用")
|
||||
private String templateStatus;
|
||||
|
||||
/** 创建人 */
|
||||
@Excel(name = "创建人")
|
||||
private Long createId;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String createUser;
|
||||
|
||||
/** 修改人 */
|
||||
@Excel(name = "修改人")
|
||||
private Long updateId;
|
||||
|
||||
/** $column.columnComment */
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String updateUser;
|
||||
|
||||
/** 排序 */
|
||||
@Excel(name = "排序")
|
||||
private Long sort;
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
public void setTemplateName(String templateName)
|
||||
{
|
||||
this.templateName = templateName;
|
||||
}
|
||||
|
||||
public String getTemplateName()
|
||||
{
|
||||
return templateName;
|
||||
}
|
||||
public void setTemplateType(String templateType)
|
||||
{
|
||||
this.templateType = templateType;
|
||||
}
|
||||
|
||||
public String getTemplateType()
|
||||
{
|
||||
return templateType;
|
||||
}
|
||||
public void setTemplateContent(String templateContent)
|
||||
{
|
||||
this.templateContent = templateContent;
|
||||
}
|
||||
|
||||
public String getTemplateContent()
|
||||
{
|
||||
return templateContent;
|
||||
}
|
||||
public void setTemplateStatus(String templateStatus)
|
||||
{
|
||||
this.templateStatus = templateStatus;
|
||||
}
|
||||
|
||||
public String getTemplateStatus()
|
||||
{
|
||||
return templateStatus;
|
||||
}
|
||||
public void setCreateId(Long createId)
|
||||
{
|
||||
this.createId = createId;
|
||||
}
|
||||
|
||||
public Long getCreateId()
|
||||
{
|
||||
return createId;
|
||||
}
|
||||
public void setCreateUser(String createUser)
|
||||
{
|
||||
this.createUser = createUser;
|
||||
}
|
||||
|
||||
public String getCreateUser()
|
||||
{
|
||||
return createUser;
|
||||
}
|
||||
public void setUpdateId(Long updateId)
|
||||
{
|
||||
this.updateId = updateId;
|
||||
}
|
||||
|
||||
public Long getUpdateId()
|
||||
{
|
||||
return updateId;
|
||||
}
|
||||
public void setUpdateUser(String updateUser)
|
||||
{
|
||||
this.updateUser = updateUser;
|
||||
}
|
||||
|
||||
public String getUpdateUser()
|
||||
{
|
||||
return updateUser;
|
||||
}
|
||||
public void setSort(Long sort)
|
||||
{
|
||||
this.sort = sort;
|
||||
}
|
||||
|
||||
public Long getSort()
|
||||
{
|
||||
return sort;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("templateName", getTemplateName())
|
||||
.append("templateType", getTemplateType())
|
||||
.append("templateContent", getTemplateContent())
|
||||
.append("templateStatus", getTemplateStatus())
|
||||
.append("createId", getCreateId())
|
||||
.append("createUser", getCreateUser())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateId", getUpdateId())
|
||||
.append("updateUser", getUpdateUser())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("sort", getSort())
|
||||
.toString();
|
||||
}
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 231 KiB |
Binary file not shown.
After Width: | Height: | Size: 5.3 MiB |
|
@ -269,7 +269,7 @@ export default {
|
|||
justify-content: center;
|
||||
align-items: center;
|
||||
height: 100%;
|
||||
background-image: url("../assets/images/login-background.jpg");
|
||||
background-image: url("../assets/images/beijing.jpg");
|
||||
background-size: cover;
|
||||
}
|
||||
.title {
|
||||
|
|
|
@ -194,19 +194,19 @@
|
|||
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width =120>
|
||||
<template slot-scope="scope">
|
||||
<el-button v-if="userAccount !='OK777' && scope.row.returnVisitStatus !== '1'"
|
||||
<el-button v-if="userAccount !='OK777' "
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>配置</el-button>
|
||||
<el-button v-if="userAccount !='OK777' && scope.row.selfDeliveryStatus == '1' && scope.row.returnVisitStatus !== '1'"
|
||||
<el-button v-if="userAccount !='OK777' && scope.row.selfDeliveryStatus == '1' "
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-bicycle"
|
||||
@click="handleSelfDelivery(scope.row)"
|
||||
>自配送</el-button>
|
||||
<el-button v-if="userAccount !='OK777' && scope.row.returnVisitStatus !== '1'"
|
||||
<el-button v-if="userAccount !='OK777' "
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
|
|
Loading…
Reference in New Issue