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 de51c4c..8a481ae 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 @@ -63,7 +63,7 @@ public class AiServiceImpl implements IAiService { @Autowired private AiProducter aiProducer; - private final ReentrantLock lock = new ReentrantLock(); + private final static ReentrantLock lock = new ReentrantLock(); private String userSn = "SYSUSER|8398f13f3feccef770ee4d465fe22fbf"; private String aiUserSn = "SYSUSER|2665bcca63a2b5c724095fa01dce0470"; @@ -237,7 +237,6 @@ public class AiServiceImpl implements IAiService { for (BusStoreInfo busStoreInfo : storeInfoList) { try { if ("2".equals(busStoreInfo.getReturnVisitStatus())) { - log.error("未开启营销的跳出"); continue;// 未开启营销的跳出 } // 配置规则 @@ -247,10 +246,8 @@ public class AiServiceImpl implements IAiService { List list = new ArrayList<>(); if ("1".equals(busStoreInfo.getSelfDeliveryStatus())) { - log.error("自动营销"); list = orderInfoService.selectBusOrderInfoListToAi(busStoreInfo.getStoreCode(), t1, t2); } else if ("2".equals(busStoreInfo.getSelfDeliveryStatus())) { - log.error("自配送营销"); LocalDateTime t180 = now.minusMinutes(180); String t18 = t180.format(formatter); LocalDateTime tN = now.minusMinutes(busStoreConfigInfo.getSelfDeliveryDuration()); @@ -284,6 +281,7 @@ public class AiServiceImpl implements IAiService { aiProducer.sendInfo(mqDataInfo); } }catch (Exception e){ + log.error("***************************"+e.getMessage()); e.printStackTrace(); continue; } @@ -307,7 +305,6 @@ public class AiServiceImpl implements IAiService { @Override public void sendSmsTask(String content, BusOrderInfo busOrderInfo) { - lock.lock(); try { BusSmsInfo busSmsInfo = new BusSmsInfo(); @@ -322,6 +319,8 @@ public class AiServiceImpl implements IAiService { log.error("短信余额为空,请充值"); return; } + redisTemplate.opsForValue().set("limitNum",busSmsInfo1.getLimitNum()+""); + redisTemplate.opsForValue().set("totalNum",busSmsInfo1.getTotalNum()+""); }else{ redisTemplate.opsForValue().set("limitNum",busSmsInfo1.getLimitNum()+""); redisTemplate.opsForValue().set("totalNum",busSmsInfo1.getTotalNum()+"");