店铺昨日好评,多店铺绑定,更换短信账户限额修改
This commit is contained in:
parent
1591f779bb
commit
736992d086
|
@ -57,29 +57,25 @@ document.addEventListener("mouseup", function(e) {
|
||||||
var phone = localStorage.getItem('phone')
|
var phone = localStorage.getItem('phone')
|
||||||
var password = localStorage.getItem('password')
|
var password = localStorage.getItem('password')
|
||||||
var wmPoiName = localStorage.getItem('wmPoiName')
|
var wmPoiName = localStorage.getItem('wmPoiName')
|
||||||
//console.log('ccccccccccccccccccccccccccccccc'+userName)
|
|
||||||
//console.log('ddddddddddddddddddddddddddddddd'+cookies)
|
// if(account !== null && password !== null && account !== 'null' && password!== 'null' && account !== '' && password !== ''){
|
||||||
//console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'+account)
|
// if ('1' === sysType) {
|
||||||
//console.log('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'+password)
|
// //服务器地址
|
||||||
//console.log('eeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'+wmPoiName)
|
// xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
|
||||||
if(account !== null && password !== null && account !== 'null' && password!== 'null' && account !== '' && password !== ''){
|
// } else {
|
||||||
if ('1' === sysType) {
|
// xhr.open('POST', 'https://www.shivers.top/prod-api/negative/store_bing', true)
|
||||||
//服务器地址
|
// }
|
||||||
xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
|
// xhr.setRequestHeader("Content-Type","application/json")
|
||||||
} else {
|
// var sendData = {'bingType': 1, 'cookie': cookies, 'userName': userName, 'account': account, 'password': password, 'wmPoiName': wmPoiName}
|
||||||
xhr.open('POST', 'https://www.shivers.top/prod-api/negative/store_bing', true)
|
// xhr.send(JSON.stringify(sendData))
|
||||||
}
|
// xhr.onreadystatechange = function () {
|
||||||
xhr.setRequestHeader("Content-Type","application/json")
|
// if (xhr.readyState === 4 && xhr.status === 200) {
|
||||||
var sendData = {'bingType': 1, 'cookie': cookies, 'userName': userName, 'account': account, 'password': password, 'wmPoiName': wmPoiName}
|
// if (xhr.responseText === 'true') {
|
||||||
xhr.send(JSON.stringify(sendData))
|
// alert('当前授权完成,请直接关闭当前浏览器!')
|
||||||
xhr.onreadystatechange = function () {
|
// }
|
||||||
if (xhr.readyState === 4 && xhr.status === 200) {
|
// }
|
||||||
if (xhr.responseText === 'true') {
|
// }
|
||||||
alert('当前授权完成,请直接关闭当前浏览器!')
|
// }else if(phone !== null && phone !== 'null' ){
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}else if(phone !== null && phone !== 'null' ){
|
|
||||||
if ('1' === sysType) {
|
if ('1' === sysType) {
|
||||||
//服务器地址
|
//服务器地址
|
||||||
xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
|
xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
|
||||||
|
@ -87,7 +83,15 @@ document.addEventListener("mouseup", function(e) {
|
||||||
xhr.open('POST', 'https://www.shivers.top/prod-api/negative/store_bing', true)
|
xhr.open('POST', 'https://www.shivers.top/prod-api/negative/store_bing', true)
|
||||||
}
|
}
|
||||||
xhr.setRequestHeader("Content-Type","application/json")
|
xhr.setRequestHeader("Content-Type","application/json")
|
||||||
var sendData = {'bingType': 1, 'cookie': cookies, 'userName': userName, 'account': phone, 'password': null, 'wmPoiName': wmPoiName}
|
var sendData
|
||||||
|
if(phone !== null && phone !== 'null'){
|
||||||
|
sendData = {'bingType': 1, 'cookie': cookies, 'userName': userName, 'account': phone, 'password': null, 'wmPoiName': wmPoiName}
|
||||||
|
}
|
||||||
|
if(account !== null && password !== null && account !== 'null' && password!== 'null' && account !== '' && password !== ''){
|
||||||
|
sendData = {'bingType': 1, 'cookie': cookies, 'userName': userName, 'account': account, 'password': password, 'wmPoiName': wmPoiName}
|
||||||
|
}else {
|
||||||
|
sendData = {'bingType': 1, 'cookie': cookies, 'userName': userName, 'account': null, 'password': null, 'wmPoiName': wmPoiName}
|
||||||
|
}
|
||||||
xhr.send(JSON.stringify(sendData))
|
xhr.send(JSON.stringify(sendData))
|
||||||
xhr.onreadystatechange = function () {
|
xhr.onreadystatechange = function () {
|
||||||
if (xhr.readyState === 4 && xhr.status === 200) {
|
if (xhr.readyState === 4 && xhr.status === 200) {
|
||||||
|
@ -96,7 +100,7 @@ document.addEventListener("mouseup", function(e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
// }
|
||||||
localStorage.setItem('account', null)
|
localStorage.setItem('account', null)
|
||||||
localStorage.setItem('phone', null)
|
localStorage.setItem('phone', null)
|
||||||
localStorage.setItem('password', null)
|
localStorage.setItem('password', null)
|
||||||
|
@ -108,7 +112,7 @@ document.addEventListener("mouseup", function(e) {
|
||||||
var result = window.prompt('请输入需要绑定的系统登录账户', '')
|
var result = window.prompt('请输入需要绑定的系统登录账户', '')
|
||||||
username = result
|
username = result
|
||||||
if (username != null) {
|
if (username != null) {
|
||||||
var resultOne = confirm('确定要绑定到营销生态系统吗?')
|
var resultOne = confirm('确定要绑定到优势管家系统吗?')
|
||||||
if (resultOne) {
|
if (resultOne) {
|
||||||
var xhr = new XMLHttpRequest()
|
var xhr = new XMLHttpRequest()
|
||||||
xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
|
xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
|
||||||
|
@ -143,4 +147,4 @@ document.addEventListener("mouseup", function(e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})()
|
})()
|
||||||
|
|
|
@ -86,7 +86,7 @@ public class BusAgentInfoController extends BaseController {
|
||||||
String endTime = date + " 23:59:59";
|
String endTime = date + " 23:59:59";
|
||||||
int lastUserIntegralNum = iBusStoreInfoService.lastUserIntegralNum(bean.getAgentAccount(), startTime, endTime);
|
int lastUserIntegralNum = iBusStoreInfoService.lastUserIntegralNum(bean.getAgentAccount(), startTime, endTime);
|
||||||
bean.setLastUseIntegralNum(lastUserIntegralNum);
|
bean.setLastUseIntegralNum(lastUserIntegralNum);
|
||||||
bean.setLastPositiveReviewsNum(iBusStoreInfoService.lastPositiveReviewsNum(bean.getAgentAccount()));
|
bean.setLastPositiveReviewsNum(iBusStoreInfoService.lastPositiveReviewsNum(bean.getAgentAccount(), startTime, endTime));
|
||||||
List<BusStoreInfo> lll = ll.stream().filter(f -> "1".equals(f.getReturnVisitStatus())).collect(Collectors.toList());
|
List<BusStoreInfo> lll = ll.stream().filter(f -> "1".equals(f.getReturnVisitStatus())).collect(Collectors.toList());
|
||||||
bean.setOperateStoreNum(lll.size());
|
bean.setOperateStoreNum(lll.size());
|
||||||
SysUser user1 = iSysUserService.selectUserById(bean.getId());
|
SysUser user1 = iSysUserService.selectUserById(bean.getId());
|
||||||
|
|
|
@ -68,7 +68,7 @@ public interface BusStoreInfoMapper
|
||||||
|
|
||||||
String getBindUserByStoreCode(String wmPoiId);
|
String getBindUserByStoreCode(String wmPoiId);
|
||||||
|
|
||||||
int lastPositiveReviewsNum(String agentAccount);
|
int lastPositiveReviewsNum(@Param("agentAccount") String agentAccount,@Param("startTime") String startTime,@Param("endTime") String endTime);
|
||||||
|
|
||||||
List<RespBusStoreInfo> storeStatistics(BusStoreInfo busStoreInfo);
|
List<RespBusStoreInfo> storeStatistics(BusStoreInfo busStoreInfo);
|
||||||
|
|
||||||
|
|
|
@ -82,7 +82,7 @@ public interface IBusStoreInfoService
|
||||||
|
|
||||||
int changeReturnVisitStatus(BusStoreInfo busStoreInfo);
|
int changeReturnVisitStatus(BusStoreInfo busStoreInfo);
|
||||||
|
|
||||||
int lastPositiveReviewsNum(String agentAccount);
|
int lastPositiveReviewsNum(String agentAccount,String startTime,String endTime);
|
||||||
|
|
||||||
List<RespBusStoreInfo> storeStatistics(BusStoreInfo busStoreInfo);
|
List<RespBusStoreInfo> storeStatistics(BusStoreInfo busStoreInfo);
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,7 @@ import java.time.LocalTime;
|
||||||
import java.time.ZoneId;
|
import java.time.ZoneId;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -62,6 +63,8 @@ public class AiServiceImpl implements IAiService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private AiProducter aiProducer;
|
private AiProducter aiProducer;
|
||||||
|
|
||||||
|
private final ReentrantLock lock = new ReentrantLock();
|
||||||
|
|
||||||
private String userSn = "SYSUSER|8398f13f3feccef770ee4d465fe22fbf";
|
private String userSn = "SYSUSER|8398f13f3feccef770ee4d465fe22fbf";
|
||||||
private String aiUserSn = "SYSUSER|2665bcca63a2b5c724095fa01dce0470";
|
private String aiUserSn = "SYSUSER|2665bcca63a2b5c724095fa01dce0470";
|
||||||
|
|
||||||
|
@ -303,15 +306,13 @@ public class AiServiceImpl implements IAiService {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized void sendSmsTask(String content, BusOrderInfo busOrderInfo) {
|
public void sendSmsTask(String content, BusOrderInfo busOrderInfo) {
|
||||||
|
|
||||||
|
lock.lock();
|
||||||
try {
|
try {
|
||||||
BusSmsInfo busSmsInfo = new BusSmsInfo();
|
BusSmsInfo busSmsInfo = new BusSmsInfo();
|
||||||
String num = Optional.ofNullable(redisTemplate.opsForValue().get("limitNum")).orElse(null);
|
String limitNum = Optional.ofNullable(redisTemplate.opsForValue().get("limitNum")).orElse(null);
|
||||||
BusSmsInfo busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(num);
|
BusSmsInfo busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(limitNum);
|
||||||
if(num == null && busSmsInfo1 != null){
|
|
||||||
redisTemplate.opsForValue().set("limitNum",busSmsInfo1.getLimitNum()+"");
|
|
||||||
redisTemplate.opsForValue().set("totalNum",busSmsInfo1.getTotalNum()+"");
|
|
||||||
}
|
|
||||||
if(busSmsInfo1 == null){
|
if(busSmsInfo1 == null){
|
||||||
String totalNum = redisTemplate.opsForValue().get("totalNum");
|
String totalNum = redisTemplate.opsForValue().get("totalNum");
|
||||||
busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(totalNum);
|
busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(totalNum);
|
||||||
|
@ -321,6 +322,9 @@ public class AiServiceImpl implements IAiService {
|
||||||
log.error("短信余额为空,请充值");
|
log.error("短信余额为空,请充值");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
}else{
|
||||||
|
redisTemplate.opsForValue().set("limitNum",busSmsInfo1.getLimitNum()+"");
|
||||||
|
redisTemplate.opsForValue().set("totalNum",busSmsInfo1.getTotalNum()+"");
|
||||||
}
|
}
|
||||||
busSmsInfo.setId(busSmsInfo1.getId());
|
busSmsInfo.setId(busSmsInfo1.getId());
|
||||||
busSmsInfo.setRechargeNum(busSmsInfo1.getRechargeNum()+1);
|
busSmsInfo.setRechargeNum(busSmsInfo1.getRechargeNum()+1);
|
||||||
|
@ -338,6 +342,8 @@ public class AiServiceImpl implements IAiService {
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
log.error("建立sendSmsTask错误: ",e.getMessage());
|
log.error("建立sendSmsTask错误: ",e.getMessage());
|
||||||
|
}finally {
|
||||||
|
lock.unlock();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -166,8 +166,8 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int lastPositiveReviewsNum(String agentAccount) {
|
public int lastPositiveReviewsNum(String agentAccount,String startTime,String endTime) {
|
||||||
return busStoreInfoMapper.lastPositiveReviewsNum(agentAccount);
|
return busStoreInfoMapper.lastPositiveReviewsNum(agentAccount, startTime, endTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -104,7 +104,8 @@ public class MeituanServiceImpl implements IMeituanService {
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public String cookieInfo(SysCookie cookie) {
|
public String cookieInfo(SysCookie cookie) {
|
||||||
BusStoreInfo storeInfo = new BusStoreInfo();
|
BusStoreInfo storeInfo = new BusStoreInfo();
|
||||||
if("".equals(valueFromCookie("wmPoiId", cookie.getCookie()))){
|
String wmPoiId = valueFromCookie("wmPoiId", cookie.getCookie());
|
||||||
|
if("".equals(wmPoiId) || "-1".equals(wmPoiId)){
|
||||||
return "false";
|
return "false";
|
||||||
}
|
}
|
||||||
storeInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie()));
|
storeInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie()));
|
||||||
|
|
|
@ -113,9 +113,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<include refid="selectBusStoreInfoVo"/>
|
<include refid="selectBusStoreInfoVo"/>
|
||||||
where id = #{wmPoiId}
|
where id = #{wmPoiId}
|
||||||
</select>
|
</select>
|
||||||
<select id="lastPositiveReviewsNum" resultType="java.lang.Integer">
|
<select id="lastPositiveReviewsNum" parameterType="java.lang.String" resultType="java.lang.Integer">
|
||||||
select ifnull(sum(last_positive_reviews_num),0) from bus_store_day_info
|
select ifnull(sum(last_positive_reviews_num),0) from bus_store_day_info
|
||||||
where store_id in (select id from bus_store_info where bind_user =#{agentAccount})
|
where store_id in (select id from bus_store_info where bind_user =#{agentAccount})
|
||||||
|
and create_time between #{startTime} and #{endTime}
|
||||||
</select>
|
</select>
|
||||||
<select id="storeStatistics" resultType="com.ruoyi.business.domain.resp.RespBusStoreInfo">
|
<select id="storeStatistics" resultType="com.ruoyi.business.domain.resp.RespBusStoreInfo">
|
||||||
SELECT
|
SELECT
|
||||||
|
|
Loading…
Reference in New Issue