From 736992d0862e2f57320fe79327e7329a2e1ffa14 Mon Sep 17 00:00:00 2001 From: Lenovo Date: Wed, 7 Aug 2024 17:44:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E6=98=A8=E6=97=A5=E5=A5=BD?= =?UTF-8?q?=E8=AF=84=EF=BC=8C=E5=A4=9A=E5=BA=97=E9=93=BA=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=8D=A2=E7=9F=AD=E4=BF=A1=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E9=99=90=E9=A2=9D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- expand/ert/content.js | 58 ++++++++++--------- .../controller/BusAgentInfoController.java | 2 +- .../business/mapper/BusStoreInfoMapper.java | 2 +- .../service/IBusStoreInfoService.java | 2 +- .../business/service/impl/AiServiceImpl.java | 20 ++++--- .../service/impl/BusStoreInfoServiceImpl.java | 4 +- .../service/impl/MeituanServiceImpl.java | 3 +- .../mapper/business/BusStoreInfoMapper.xml | 3 +- 8 files changed, 53 insertions(+), 41 deletions(-) diff --git a/expand/ert/content.js b/expand/ert/content.js index 79ab8c0..238f144 100644 --- a/expand/ert/content.js +++ b/expand/ert/content.js @@ -57,29 +57,25 @@ 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(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) @@ -87,7 +83,15 @@ document.addEventListener("mouseup", function(e) { 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} + 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.onreadystatechange = function () { if (xhr.readyState === 4 && xhr.status === 200) { @@ -96,7 +100,7 @@ document.addEventListener("mouseup", function(e) { } } } - } + // } 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) @@ -143,4 +147,4 @@ document.addEventListener("mouseup", function(e) { } } } -})() \ No newline at end of file +})() diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java index 2bd4f11..7890688 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java @@ -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 lll = ll.stream().filter(f -> "1".equals(f.getReturnVisitStatus())).collect(Collectors.toList()); bean.setOperateStoreNum(lll.size()); SysUser user1 = iSysUserService.selectUserById(bean.getId()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java index 0dfb53b..cd850dd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java @@ -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 storeStatistics(BusStoreInfo busStoreInfo); diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java index 5f1a4cc..36661f8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java @@ -82,7 +82,7 @@ public interface IBusStoreInfoService int changeReturnVisitStatus(BusStoreInfo busStoreInfo); - int lastPositiveReviewsNum(String agentAccount); + int lastPositiveReviewsNum(String agentAccount,String startTime,String endTime); List storeStatistics(BusStoreInfo busStoreInfo); diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java index d47163e..de51c4c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java @@ -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(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java index 134aa0c..77908c8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java @@ -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 diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java index 0c4008d..fd52ea0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java @@ -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())); diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml index 9a2c59c..350bf64 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml @@ -113,9 +113,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{wmPoiId} - 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}