parent
c6008344fa
commit
18bb013925
|
@ -59,7 +59,7 @@ public class BusStoreDayHistoryInfoController extends BaseController
|
|||
@GetMapping("/list")
|
||||
public TableDataInfo list(BusStoreExcelInfo excelInfo)
|
||||
{
|
||||
startPage();
|
||||
// startPage();
|
||||
List<BusStoreExcelInfo> list = busStoreDayHistoryInfoService.selectBusStoreDayHistoryInfoList(excelInfo);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
|
|
@ -3,8 +3,12 @@ package com.ruoyi.common.config;
|
|||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.lianlu.common.Credential;
|
||||
import com.lianlu.models.SmsSend;
|
||||
import com.tencentcloudapi.common.profile.ClientProfile;
|
||||
import com.tencentcloudapi.common.profile.HttpProfile;
|
||||
import com.tencentcloudapi.sms.v20210111.SmsClient;
|
||||
import lombok.Data;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@Data
|
||||
|
@ -17,23 +21,35 @@ public class BusTencentProperties {
|
|||
private String appId;
|
||||
@Value("${tencent.bus.appKey}")
|
||||
private String appKey;
|
||||
//
|
||||
// private static String MchId = "1049039";
|
||||
// private static String AppId = "10011721121033115";
|
||||
// private static String AppKey = "c167746e38d64143a874cec3d5de014e";
|
||||
|
||||
private static String MchId = "1049039";
|
||||
private static String AppId = "10011721121033115";
|
||||
private static String AppKey = "c167746e38d64143a874cec3d5de014e";
|
||||
public JSONObject smsCredential(String phone, String content){
|
||||
//使用http需给Credential添加true参数new Credential(MchId, AppId, AppKey, true);
|
||||
Credential credential = new Credential(enterpriseId, appId, appKey, true);
|
||||
SmsSend s = new SmsSend();
|
||||
s.setPhoneNumberSet(new String[] {phone});
|
||||
s.setSignName("【优势管家】");
|
||||
s.setSessionContext(content);
|
||||
try {
|
||||
return s.NormalSend(credential,s);
|
||||
} catch (Exception e) {
|
||||
System.out.println(e.getMessage());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
// //使用http需给Credential添加true参数new Credential(MchId, AppId, AppKey, true);
|
||||
Credential credential = new Credential(MchId, AppId, AppKey, true);
|
||||
|
||||
// NormalSend
|
||||
SmsSend s = new SmsSend();
|
||||
s.setPhoneNumberSet(new String[] {"17612400322"});
|
||||
s.setSignName("【签名内容】");
|
||||
s.setSessionContext("短信内容");
|
||||
JSONObject re = s.NormalSend(credential, s);
|
||||
System.out.println(re);
|
||||
//// //使用http需给Credential添加true参数new Credential(MchId, AppId, AppKey, true);
|
||||
// BusTencentProperties busTencentProperties = new BusTencentProperties();
|
||||
// JSONObject ss = busTencentProperties.smsCredential("17612400322","短信内容");
|
||||
// SmsSend s = new SmsSend();
|
||||
//// NormalSend
|
||||
// JSONObject re = s.NormalSend()
|
||||
// System.out.println(re);
|
||||
|
||||
// PersonalSend
|
||||
// SmsSend s = new SmsSend();
|
||||
|
|
|
@ -6,6 +6,7 @@ import com.alibaba.fastjson2.JSONObject;
|
|||
import com.ruoyi.business.domain.*;
|
||||
import com.ruoyi.business.mapper.BusReturnVisitInfoMapper;
|
||||
import com.ruoyi.business.service.*;
|
||||
import com.ruoyi.common.config.BusTencentProperties;
|
||||
import com.ruoyi.common.utils.HttpClientUtilT;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.redis.core.StringRedisTemplate;
|
||||
|
@ -48,6 +49,8 @@ public class AiServiceImpl implements IAiService {
|
|||
private IBusStoreConfigInfoService iBusStoreConfigInfoService;
|
||||
@Autowired
|
||||
private IBusBanOperateInfoService iBusBanOperateInfoService;
|
||||
@Autowired
|
||||
private BusTencentProperties busTencentProperties;
|
||||
|
||||
private String userSn = "SYSUSER|8398f13f3feccef770ee4d465fe22fbf";
|
||||
private String aiUserSn = "SYSUSER|2665bcca63a2b5c724095fa01dce0470";
|
||||
|
@ -363,7 +366,7 @@ public class AiServiceImpl implements IAiService {
|
|||
if("AI".equals(busStoreInfo.getMarketingChannels())){
|
||||
sendAiTask(content,busOrderInfo);
|
||||
}else if("sms".equals(busStoreInfo.getMarketingChannels())){
|
||||
sendSmsTask();
|
||||
sendSmsTask(busOrderInfo);
|
||||
}else{
|
||||
sendAiTask(content,busOrderInfo);
|
||||
}
|
||||
|
@ -394,7 +397,8 @@ public class AiServiceImpl implements IAiService {
|
|||
}
|
||||
}
|
||||
|
||||
private void sendSmsTask() {
|
||||
private void sendSmsTask(BusOrderInfo busOrderInfo) {
|
||||
|
||||
}
|
||||
|
||||
private void addAiTaskTest(String apiKey, String content, BusOrderInfo busOrderInfo) {
|
||||
|
|
|
@ -10,6 +10,7 @@ import com.ruoyi.business.mapper.BusStoreInfoMapper;
|
|||
import com.ruoyi.business.service.IBusStoreDayHistoryInfoService;
|
||||
import com.ruoyi.business.service.IBusStoreDayInfoService;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.PageUtils;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
@ -62,6 +63,7 @@ public class BusStoreDayHistoryInfoServiceImpl implements IBusStoreDayHistoryInf
|
|||
}
|
||||
busStoreExcelInfo.setStoreList(sl);
|
||||
}
|
||||
PageUtils.startPage();
|
||||
return busStoreDayHistoryInfoMapper.selectBusStoreDayHistoryInfoList(busStoreExcelInfo);
|
||||
}
|
||||
|
||||
|
|
|
@ -380,24 +380,16 @@ public class MeituanServiceImpl implements IMeituanService {
|
|||
for (int i = 0; i < array.size(); i++) {
|
||||
BusOrderInfo orderInfo = new BusOrderInfo();
|
||||
Object o = array.get(i);
|
||||
try {
|
||||
JSONObject oj = JSONObject.parseObject(JSON.toJSONString(o));
|
||||
String isPhf = oj.getString("businessType");
|
||||
JSONObject order0 = oj.getJSONObject("orderInfo");
|
||||
JSONObject commonInfo = oj.getJSONObject("commonInfo");
|
||||
JSONObject order1 = order0.getJSONObject("orderInfo");
|
||||
JSONObject foodInfo = order0.getJSONObject("foodInfo");
|
||||
if(foodInfo != null){
|
||||
JSONObject userLabelVo = foodInfo.getJSONObject("userLabelVo");
|
||||
JSONArray array1 = userLabelVo.getJSONArray("contents");
|
||||
String info = array1.getJSONObject(0).getString("info");
|
||||
if ("门店新客".equals(info)){
|
||||
orderInfo.setOrderCount("1");
|
||||
} else if (info.contains("下单")){
|
||||
orderInfo.setOrderCount(info.substring(info.indexOf("下单")+2,info.length()-1));
|
||||
}else{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
JSONObject expectTimeVo = order1.getJSONObject("expectTimeVo");
|
||||
String daySeq = order1.getString("dayseq");
|
||||
String wmOrderViewId = order1.getString("wmOrderViewId");
|
||||
|
@ -436,7 +428,11 @@ public class MeituanServiceImpl implements IMeituanService {
|
|||
orderInfo.setCompleteTime("2024-"+expectTime);
|
||||
orderInfo.setOrderStatus(statusDesc);
|
||||
orderInfo.setCustomId(userId);
|
||||
|
||||
if ("门店新客".equals(info)){
|
||||
orderInfo.setOrderCount("1");
|
||||
} else if (info.contains("下单")){
|
||||
orderInfo.setOrderCount(info.substring(info.indexOf("下单")+2,info.length()-1));
|
||||
}
|
||||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
|
||||
try {
|
||||
orderInfo.setOrderTime(format.parse("2024-"+orderTimeFmt));
|
||||
|
@ -444,6 +440,10 @@ public class MeituanServiceImpl implements IMeituanService {
|
|||
throw new RuntimeException(e);
|
||||
}
|
||||
orderInfo.setIsPhf(isPhf);
|
||||
}catch (Exception e){
|
||||
System.out.println(e.getMessage());
|
||||
continue;
|
||||
}
|
||||
list.add(orderInfo);
|
||||
}
|
||||
if (list.size() > 0) {
|
||||
|
|
|
@ -159,7 +159,11 @@
|
|||
|
||||
<el-table v-loading="loading" :data="storeList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="50" align="center" />
|
||||
<el-table-column label="序号" type="index" width="50" />
|
||||
<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="平台" prop="platformType" width="55">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
|
||||
|
|
|
@ -179,7 +179,11 @@
|
|||
|
||||
<el-table v-loading="loading" :data="storeList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="50" align="center" />
|
||||
<el-table-column label="序号" type="index" width="50" />
|
||||
<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="平台" prop="platformType" width="55">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
|
||||
|
|
|
@ -49,7 +49,11 @@
|
|||
|
||||
<el-table v-loading="loading" :data="templateList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" prop="id"/>
|
||||
<el-table-column label="序号" type="index" ></el-table-column>
|
||||
<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="templateName" />
|
||||
<el-table-column label="模版类型" align="center" prop="templateType" />
|
||||
<!-- <el-table-column label="内容" align="center" prop="templateContent" /> -->
|
||||
|
|
|
@ -63,7 +63,12 @@
|
|||
|
||||
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="序号" align="center" prop="storeId" />
|
||||
<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="storeId" /> -->
|
||||
<el-table-column label="店铺名称" align="center" prop="storeName" />
|
||||
<el-table-column label="订单日期" align="center" prop="orderDate" />
|
||||
<el-table-column label="好评日期" align="center" prop="commentsDate" />
|
||||
|
|
|
@ -28,7 +28,11 @@
|
|||
</el-row> -->
|
||||
|
||||
<el-table v-loading="loading" :data="infoList" >
|
||||
<el-table-column label="序号" align="center" type="index"/>
|
||||
<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="storeName" />
|
||||
<el-table-column label="店铺标识" align="center" prop="storeCode" />
|
||||
<el-table-column label="操作账户" align="center" prop="updateUser" />
|
||||
|
|
|
@ -160,7 +160,11 @@
|
|||
|
||||
<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="序号" type="index" width="50" >
|
||||
<template slot-scope="scope">
|
||||
{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="平台" prop="platformType" width="55">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_platform_type" :value="scope.row.platformType"/>
|
||||
|
|
|
@ -62,7 +62,11 @@
|
|||
|
||||
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" prop="id"/>
|
||||
<el-table-column label="序号" type="index" width="120" />
|
||||
<el-table-column label="序号" type="index" width="150" >
|
||||
<template slot-scope="scope">
|
||||
{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="名称" prop="storeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="标识" prop="storeCode" />
|
||||
<el-table-column label="发送号码" prop="phoneNumber" align="center" width=""/>
|
||||
|
|
Loading…
Reference in New Issue