ai 发送修改
This commit is contained in:
parent
db39f1df74
commit
ec84f9c665
|
@ -1,22 +1,11 @@
|
||||||
package com.ruoyi.business.controller;
|
package com.ruoyi.business.controller;
|
||||||
|
|
||||||
import com.alibaba.fastjson2.JSON;
|
import com.ruoyi.business.service.IAiService;
|
||||||
import com.alibaba.fastjson2.JSONArray;
|
import com.ruoyi.business.service.IBusFifteenInfoService;
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
import com.ruoyi.business.service.IBusOrderInfoService;
|
||||||
import com.ruoyi.business.domain.BusAiInfo;
|
|
||||||
import com.ruoyi.business.domain.BusFifteenInfo;
|
|
||||||
import com.ruoyi.business.domain.BusOrderInfo;
|
|
||||||
import com.ruoyi.business.domain.SysCookie;
|
|
||||||
import com.ruoyi.business.service.*;
|
|
||||||
import com.ruoyi.common.core.domain.R;
|
|
||||||
import com.ruoyi.common.utils.HttpClientUtilT;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -32,5 +21,11 @@ public class AiController {
|
||||||
private IBusOrderInfoService orderInfoService;
|
private IBusOrderInfoService orderInfoService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IBusFifteenInfoService fifteenInfoService;
|
private IBusFifteenInfoService fifteenInfoService;
|
||||||
|
// @GetMapping("/sendAi")
|
||||||
|
// public void sendAi() {
|
||||||
|
// Long id = 15968736020037585L;
|
||||||
|
// BusOrderInfo orderInfo = orderInfoService.selectBusOrderInfoById(id);
|
||||||
|
//// orderInfo.setPrivcyPhone("13049773624,6244");
|
||||||
|
// aiService.sendAiTask("projects|00dd4cb88fc5f777d5c578c0fdb6b3a0",orderInfo);
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,10 @@
|
||||||
package com.ruoyi.quartz.task;
|
package com.ruoyi.quartz.task;
|
||||||
|
|
||||||
import com.ruoyi.business.domain.BusReturnVisitInfo;
|
import com.ruoyi.business.service.IAiService;
|
||||||
import com.ruoyi.business.domain.BusStoreDayInfo;
|
import com.ruoyi.business.service.IMeituanService;
|
||||||
import com.ruoyi.business.domain.BusStoreInfo;
|
|
||||||
import com.ruoyi.business.service.*;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
|
||||||
import java.time.format.DateTimeFormatter;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务调度测试
|
* 定时任务调度测试
|
||||||
*
|
*
|
||||||
|
@ -18,32 +12,10 @@ import java.util.List;
|
||||||
*/
|
*/
|
||||||
@Component("ryTask")
|
@Component("ryTask")
|
||||||
public class RyTask {
|
public class RyTask {
|
||||||
@Autowired
|
|
||||||
private IBusStoreInfoService storeInfoService;
|
|
||||||
@Autowired
|
|
||||||
private IBusStoreDayInfoService iBusStoreDayInfoService;
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IAiService aiService;
|
private IAiService aiService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IMeituanService iMeituanService;
|
private IMeituanService iMeituanService;
|
||||||
@Autowired
|
|
||||||
private IBusReturnVisitInfoService iBusReturnVisitInfoService;
|
|
||||||
|
|
||||||
|
|
||||||
// public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
|
|
||||||
// {
|
|
||||||
// System.out.println(StringUtils.format("执行多参方法: 字符串类型{},布尔类型{},长整型{},浮点型{},整形{}", s, b, l, d, i));
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void ryParams(String params)
|
|
||||||
// {
|
|
||||||
// System.out.println("执行有参方法:" + params);
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void ryNoParams()
|
|
||||||
// {
|
|
||||||
// System.out.println("执行无参方法");
|
|
||||||
// }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取订单并解析号码 5分钟
|
* 获取订单并解析号码 5分钟
|
||||||
|
|
|
@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON;
|
||||||
import com.alibaba.fastjson2.JSONArray;
|
import com.alibaba.fastjson2.JSONArray;
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
import com.ruoyi.business.domain.*;
|
import com.ruoyi.business.domain.*;
|
||||||
|
import com.ruoyi.business.mapper.BusReturnVisitInfoMapper;
|
||||||
import com.ruoyi.business.service.*;
|
import com.ruoyi.business.service.*;
|
||||||
import com.ruoyi.common.utils.HttpClientUtilT;
|
import com.ruoyi.common.utils.HttpClientUtilT;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
@ -36,7 +37,7 @@ public class AiServiceImpl implements IAiService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private IBusAgentInfoService agentInfoService;
|
private IBusAgentInfoService agentInfoService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IBusReturnVisitInfoService returnVisitInfoService;
|
private BusReturnVisitInfoMapper busReturnVisitInfoMapper;
|
||||||
@Autowired
|
@Autowired
|
||||||
private IBusFifteenInfoService fifteenInfoService;
|
private IBusFifteenInfoService fifteenInfoService;
|
||||||
@Autowired
|
@Autowired
|
||||||
|
@ -233,11 +234,11 @@ public class AiServiceImpl implements IAiService {
|
||||||
}
|
}
|
||||||
BusReturnVisitInfo returnVisitInfo = new BusReturnVisitInfo();
|
BusReturnVisitInfo returnVisitInfo = new BusReturnVisitInfo();
|
||||||
returnVisitInfo.setPhoneNumber(busOrderInfo.getPrivcyPhone());
|
returnVisitInfo.setPhoneNumber(busOrderInfo.getPrivcyPhone());
|
||||||
List<BusReturnVisitInfo> list = returnVisitInfoService.selectBusReturnVisitInfoList(returnVisitInfo);
|
List<BusReturnVisitInfo> list = busReturnVisitInfoMapper.selectBusReturnVisitInfoList(returnVisitInfo);
|
||||||
if (list.size() == 1) {
|
if (list.size() == 1) {
|
||||||
returnVisitInfo.setId(list.get(0).getId());
|
returnVisitInfo.setId(list.get(0).getId());
|
||||||
returnVisitInfo.setReturnVisitTime(new Date());
|
returnVisitInfo.setReturnVisitTime(new Date());
|
||||||
returnVisitInfoService.updateBusReturnVisitInfo(returnVisitInfo);
|
busReturnVisitInfoMapper.updateBusReturnVisitInfo(returnVisitInfo);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
System.out.println("建立接口返回错误: " + e.getMessage());
|
System.out.println("建立接口返回错误: " + e.getMessage());
|
||||||
|
@ -340,7 +341,7 @@ public class AiServiceImpl implements IAiService {
|
||||||
}
|
}
|
||||||
// 当日此店铺营销限额
|
// 当日此店铺营销限额
|
||||||
if (busStoreConfigInfo.getQuota() != 0){
|
if (busStoreConfigInfo.getQuota() != 0){
|
||||||
int quota = returnVisitInfoService.countByToday(storeInfo.getStoreCode());
|
int quota = busReturnVisitInfoMapper.countByToday(storeInfo.getStoreCode());
|
||||||
if (quota >= busStoreConfigInfo.getQuota()) {
|
if (quota >= busStoreConfigInfo.getQuota()) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -401,11 +402,11 @@ public class AiServiceImpl implements IAiService {
|
||||||
BusReturnVisitInfo returnVisitInfo = new BusReturnVisitInfo();
|
BusReturnVisitInfo returnVisitInfo = new BusReturnVisitInfo();
|
||||||
orderInfo.setPrivcyPhone(aiInfo.getPhone() + "," + aiInfo.getVirtualExtensionNumber());
|
orderInfo.setPrivcyPhone(aiInfo.getPhone() + "," + aiInfo.getVirtualExtensionNumber());
|
||||||
returnVisitInfo.setPhoneNumber(aiInfo.getPhone() + "," + aiInfo.getVirtualExtensionNumber());
|
returnVisitInfo.setPhoneNumber(aiInfo.getPhone() + "," + aiInfo.getVirtualExtensionNumber());
|
||||||
List<BusReturnVisitInfo> list = returnVisitInfoService.selectBusReturnVisitInfoList(returnVisitInfo);
|
List<BusReturnVisitInfo> list = busReturnVisitInfoMapper.selectBusReturnVisitInfoList(returnVisitInfo);
|
||||||
if (list.size() == 1) {
|
if (list.size() == 1) {
|
||||||
returnVisitInfo.setId(list.get(0).getId());
|
returnVisitInfo.setId(list.get(0).getId());
|
||||||
returnVisitInfo.setFinishTime(format.parse(aiInfo.getDisconnectedAt()));
|
returnVisitInfo.setFinishTime(format.parse(aiInfo.getDisconnectedAt()));
|
||||||
returnVisitInfoService.updateBusReturnVisitInfo(returnVisitInfo);
|
busReturnVisitInfoMapper.updateBusReturnVisitInfo(returnVisitInfo);
|
||||||
}
|
}
|
||||||
List<BusOrderInfo> temp = orderInfoService.selectBusOrderInfoList(orderInfo);
|
List<BusOrderInfo> temp = orderInfoService.selectBusOrderInfoList(orderInfo);
|
||||||
if (temp.size() > 0) {
|
if (temp.size() > 0) {
|
||||||
|
|
Loading…
Reference in New Issue