wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1;代理页加序号列 

2；模板替换文本名
3；营销手机号判断
This commit is contained in:
wangshuai 2024-08-09 20:59:55 +08:00
parent 35ea841eae
commit fe5e00cb00
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java
View File

@ -212,7 +212,7 @@ public class BusStoreInfoController extends BaseController {
content = content.replaceAll("#five",busStoreDayInfo1.getLastFiveStarReviewsNum()+"");
content = content.replaceAll("#score", busStoreDayInfo1.getScore());
content = content.replaceAll("#QRCode", busTemplateInfo.getCodeUrl()==null?"":ruoYiConfig.getBaseUrl()+busTemplateInfo.getCodeUrl());
content = content.replaceAll("#text", busTemplateInfo.getRemark()==null?"":busTemplateInfo.getRemark());
content = content.replaceAll("文本：#text", busTemplateInfo.getRemark()==null?"":busTemplateInfo.getRemark());
int a = busStoreDayInfo1.getLastPositiveReviewsNum();//todo 好评-五星
int b = busStoreDayInfo1.getLastReturnVisitNum();
if (a != 0 && b != 0) {

3
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java
View File

@ -285,6 +285,9 @@ public class AiServiceImpl implements IAiService {
continue;
}
for (BusOrderInfo busOrderInfo : newList) {
if(!busOrderInfo.getPrivcyPhone().contains(",")){
continue;
}
MqDataInfo mqDataInfo = new MqDataInfo();
mqDataInfo.setAgentInfo(agentInfo);
mqDataInfo.setStoreInfo(busStoreInfo);

3
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
View File

@ -304,6 +304,7 @@ public class MeituanServiceImpl implements IMeituanService {
*/
@Override
public String orderInfoList() {
log.error(("拉取订单开始: "));
BusStoreInfo busStoreInfo = new BusStoreInfo();
busStoreInfo.setReturnVisitStatus("1");
String getUrl = proxyProperties.gettpsUrl();
@ -317,7 +318,7 @@ public class MeituanServiceImpl implements IMeituanService {
try {
countDownLatch.await(); //保证之前的所有的线程都执行完成，才会走下面的；
long endTime = System.currentTimeMillis(); //结束时间
log.error(("一共耗时time: " + (endTime - startTime) / 1000 + " s"));
log.error(("拉取订单结束，一共耗时time: " + (endTime - startTime) / 1000 + " s"));
// 这样就可以在下面拿到所有线程执行完的集合结果
} catch (Exception e) {
log.error("阻塞异常:"+e.getMessage());

7
ruoyi-ui/src/views/agent/list/index.vue
View File

@ -78,7 +78,12 @@
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="序号" type="index" width="50" >
<template slot-scope="scope">
{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column label="代理商编码" align="center" prop="id" />
<el-table-column label="代理人账号" align="center" prop="agentAccount" />
<el-table-column label="代理人姓名" align="center" prop="agentName" />
<el-table-column label="上级代理商编码" align="center" prop="superiorAgentCode" />