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

1；渠道判断，默认ai 

2；页面查询条件清空
3；特殊订单排除拉取
This commit is contained in:
wangshuai 2024-07-23 11:09:17 +08:00
parent b8f9fef5bc
commit c6008344fa
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,8 +362,10 @@ public class AiServiceImpl implements IAiService {
System.out.println("话术：" + content + "; order" + busOrderInfo.toString()); System.out.println("话术：" + content + "; order" + busOrderInfo.toString());
if("AI".equals(busStoreInfo.getMarketingChannels())){ if("AI".equals(busStoreInfo.getMarketingChannels())){
sendAiTask(content,busOrderInfo); sendAiTask(content,busOrderInfo);
}else{ }else if("sms".equals(busStoreInfo.getMarketingChannels())){
sendSmsTask(); sendSmsTask();
}else{
sendAiTask(content,busOrderInfo);
} }
}else { }else {
BusAgentInfo busAgentInfo = agentInfoL.get(0); BusAgentInfo busAgentInfo = agentInfoL.get(0);

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

@ -386,9 +386,18 @@ public class MeituanServiceImpl implements IMeituanService {
JSONObject commonInfo = oj.getJSONObject("commonInfo"); JSONObject commonInfo = oj.getJSONObject("commonInfo");
JSONObject order1 = order0.getJSONObject("orderInfo"); JSONObject order1 = order0.getJSONObject("orderInfo");
JSONObject foodInfo = order0.getJSONObject("foodInfo"); JSONObject foodInfo = order0.getJSONObject("foodInfo");
JSONObject userLabelVo = foodInfo.getJSONObject("userLabelVo"); if(foodInfo != null){
JSONArray array1 = userLabelVo.getJSONArray("contents"); JSONObject userLabelVo = foodInfo.getJSONObject("userLabelVo");
String info = array1.getJSONObject(0).getString("info"); 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"); JSONObject expectTimeVo = order1.getJSONObject("expectTimeVo");
String daySeq = order1.getString("dayseq"); String daySeq = order1.getString("dayseq");
String wmOrderViewId = order1.getString("wmOrderViewId"); String wmOrderViewId = order1.getString("wmOrderViewId");
@ -427,11 +436,7 @@ public class MeituanServiceImpl implements IMeituanService {
orderInfo.setCompleteTime("2024-"+expectTime); orderInfo.setCompleteTime("2024-"+expectTime);
orderInfo.setOrderStatus(statusDesc); orderInfo.setOrderStatus(statusDesc);
orderInfo.setCustomId(userId); 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"); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
try { try {
orderInfo.setOrderTime(format.parse("2024-"+orderTimeFmt)); orderInfo.setOrderTime(format.parse("2024-"+orderTimeFmt));

2
ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
View File

@ -165,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="saleBindName != null">#{saleBindName},</if> <if test="saleBindName != null">#{saleBindName},</if>
<if test="saleBindTime != null">#{saleBindTime},</if> <if test="saleBindTime != null">#{saleBindTime},</if>
<if test="price != null">#{price},</if> <if test="price != null">#{price},</if>
<if test="marketingChannels != null">#{price},</if> <if test="marketingChannels != null">#{marketingChannels},</if>
</trim> </trim>
</insert> </insert>

2
ruoyi-ui/src/views/market/self/index.vue
View File

@ -441,7 +441,7 @@ export default {
grantStatus: undefined, grantStatus: undefined,
returnVisitStatus: undefined, returnVisitStatus: undefined,
selfDeliveryStatus: 2, selfDeliveryStatus: 2,
marketingChannels: 'AI' marketingChannels: undefined
}, },
saleList: [], saleList: [],
timeRange: undefined, timeRange: undefined,

2
ruoyi-ui/src/views/market/whole/index.vue
View File

@ -511,7 +511,7 @@ export default {
grantStatus: undefined, grantStatus: undefined,
returnVisitStatus: undefined, returnVisitStatus: undefined,
selfDeliveryStatus: 1, selfDeliveryStatus: 1,
marketingChannels: 'AI' marketingChannels: undefined
}, },
queryParams1: { queryParams1: {
content: undefined content: undefined