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

店铺昨日好评，多店铺绑定，更换短信账户限额修改

This commit is contained in:
Lenovo 2024-08-07 17:44:11 +08:00
parent 1591f779bb
commit 736992d086
8 changed files with 53 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
expand/ert/content.js
View File

@ -57,20 +57,41 @@ document.addEventListener("mouseup", function(e) {
var phone = localStorage.getItem('phone')
var password = localStorage.getItem('password')
var wmPoiName = localStorage.getItem('wmPoiName')
//console.log('ccccccccccccccccccccccccccccccc'+userName)
//console.log('ddddddddddddddddddddddddddddddd'+cookies)
//console.log('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'+account)
//console.log('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'+password)
//console.log('eeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'+wmPoiName)
// if(account !== null && password !== null && account !== 'null' && password!== 'null' && account !== '' && password !== ''){
// if ('1' === sysType) {
// //服务器地址
// xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
// } else {
// xhr.open('POST', 'https://www.shivers.top/prod-api/negative/store_bing', true)
// }
// xhr.setRequestHeader("Content-Type","application/json")
// var sendData = {'bingType': 1, 'cookie': cookies, 'userName': userName, 'account': account, 'password': password, 'wmPoiName': wmPoiName}
// xhr.send(JSON.stringify(sendData))
// xhr.onreadystatechange = function () {
// if (xhr.readyState === 4 && xhr.status === 200) {
// if (xhr.responseText === 'true') {
// alert('当前授权完成，请直接关闭当前浏览器！')
// }
// }
// }
// }else if(phone !== null && phone !== 'null' ){
if ('1' === sysType) {
//服务器地址
xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
} else {
xhr.open('POST', 'https://www.shivers.top/prod-api/negative/store_bing', true)
}
xhr.setRequestHeader("Content-Type","application/json")
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 !== ''){
if ('1' === sysType) {
//服务器地址
xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
} else {
xhr.open('POST', 'https://www.shivers.top/prod-api/negative/store_bing', true)
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.setRequestHeader("Content-Type","application/json")
var sendData = {'bingType': 1, 'cookie': cookies, 'userName': userName, 'account': account, 'password': password, 'wmPoiName': wmPoiName}
xhr.send(JSON.stringify(sendData))
xhr.onreadystatechange = function () {
if (xhr.readyState === 4 && xhr.status === 200) {
@ -79,24 +100,7 @@ document.addEventListener("mouseup", function(e) {
}
}
}
}else if(phone !== null && phone !== 'null' ){
if ('1' === sysType) {
//服务器地址
xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)
} else {
xhr.open('POST', 'https://www.shivers.top/prod-api/negative/store_bing', true)
}
xhr.setRequestHeader("Content-Type","application/json")
var sendData = {'bingType': 1, 'cookie': cookies, 'userName': userName, 'account': phone, 'password': null, 'wmPoiName': wmPoiName}
xhr.send(JSON.stringify(sendData))
xhr.onreadystatechange = function () {
if (xhr.readyState === 4 && xhr.status === 200) {
if (xhr.responseText === 'true') {
alert('当前授权完成，请直接关闭当前浏览器！')
}
}
}
}
// }
localStorage.setItem('account', null)
localStorage.setItem('phone', null)
localStorage.setItem('password', null)
@ -108,7 +112,7 @@ document.addEventListener("mouseup", function(e) {
var result = window.prompt('请输入需要绑定的系统登录账户', '')
username = result
if (username != null) {
var resultOne = confirm('确定要绑定到营销生态系统吗？')
var resultOne = confirm('确定要绑定到优势管家系统吗？')
if (resultOne) {
var xhr = new XMLHttpRequest()
xhr.open('POST', 'https://youshi.bj.cn/prod-api/mt/cookies', true)

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

@ -86,7 +86,7 @@ public class BusAgentInfoController extends BaseController {
String endTime = date + " 23:59:59";
int lastUserIntegralNum = iBusStoreInfoService.lastUserIntegralNum(bean.getAgentAccount(), startTime, endTime);
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());
bean.setOperateStoreNum(lll.size());
SysUser user1 = iSysUserService.selectUserById(bean.getId());

2
ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java
View File

@ -68,7 +68,7 @@ public interface BusStoreInfoMapper
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);

2
ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java
View File

@ -82,7 +82,7 @@ public interface IBusStoreInfoService
int changeReturnVisitStatus(BusStoreInfo busStoreInfo);
int lastPositiveReviewsNum(String agentAccount);
int lastPositiveReviewsNum(String agentAccount,String startTime,String endTime);
List<RespBusStoreInfo> storeStatistics(BusStoreInfo busStoreInfo);

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

@ -29,6 +29,7 @@ import java.time.LocalTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
/**
@ -62,6 +63,8 @@ public class AiServiceImpl implements IAiService {
@Autowired
private AiProducter aiProducer;
private final ReentrantLock lock = new ReentrantLock();
private String userSn = "SYSUSER|8398f13f3feccef770ee4d465fe22fbf";
private String aiUserSn = "SYSUSER|2665bcca63a2b5c724095fa01dce0470";
@ -303,15 +306,13 @@ public class AiServiceImpl implements IAiService {
}
@Override
public synchronized void sendSmsTask(String content, BusOrderInfo busOrderInfo) {
public void sendSmsTask(String content, BusOrderInfo busOrderInfo) {
lock.lock();
try {
BusSmsInfo busSmsInfo = new BusSmsInfo();
String num = Optional.ofNullable(redisTemplate.opsForValue().get("limitNum")).orElse(null);
BusSmsInfo busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(num);
if(num == null && busSmsInfo1 != null){
redisTemplate.opsForValue().set("limitNum",busSmsInfo1.getLimitNum()+"");
redisTemplate.opsForValue().set("totalNum",busSmsInfo1.getTotalNum()+"");
}
String limitNum = Optional.ofNullable(redisTemplate.opsForValue().get("limitNum")).orElse(null);
BusSmsInfo busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(limitNum);
if(busSmsInfo1 == null){
String totalNum = redisTemplate.opsForValue().get("totalNum");
busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(totalNum);
@ -321,6 +322,9 @@ public class AiServiceImpl implements IAiService {
log.error("短信余额为空，请充值");
return;
}
}else{
redisTemplate.opsForValue().set("limitNum",busSmsInfo1.getLimitNum()+"");
redisTemplate.opsForValue().set("totalNum",busSmsInfo1.getTotalNum()+"");
}
busSmsInfo.setId(busSmsInfo1.getId());
busSmsInfo.setRechargeNum(busSmsInfo1.getRechargeNum()+1);
@ -338,6 +342,8 @@ public class AiServiceImpl implements IAiService {
} catch (Exception e) {
e.printStackTrace();
log.error("建立sendSmsTask错误： ",e.getMessage());
}finally {
lock.unlock();
}
}

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

@ -166,8 +166,8 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService
}
@Override
public int lastPositiveReviewsNum(String agentAccount) {
return busStoreInfoMapper.lastPositiveReviewsNum(agentAccount);
public int lastPositiveReviewsNum(String agentAccount,String startTime,String endTime) {
return busStoreInfoMapper.lastPositiveReviewsNum(agentAccount, startTime, endTime);
}
@Override

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

@ -104,7 +104,8 @@ public class MeituanServiceImpl implements IMeituanService {
@Transactional(rollbackFor = Exception.class)
public String cookieInfo(SysCookie cookie) {
BusStoreInfo storeInfo = new BusStoreInfo();
if("".equals(valueFromCookie("wmPoiId", cookie.getCookie()))){
String wmPoiId = valueFromCookie("wmPoiId", cookie.getCookie());
if("".equals(wmPoiId) || "-1".equals(wmPoiId)){
return "false";
}
storeInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie()));

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

@ -113,9 +113,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBusStoreInfoVo"/>
where id = #{wmPoiId}
</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
where store_id in (select id from bus_store_info where bind_user =#{agentAccount})
and create_time between #{startTime} and #{endTime}
</select>
<select id="storeStatistics" resultType="com.ruoyi.business.domain.resp.RespBusStoreInfo">
SELECT