From 9d5b57331525c753caf6093ce84ca33e8b32931b Mon Sep 17 00:00:00 2001 From: wangshuai Date: Fri, 9 Aug 2024 13:52:12 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E9=98=B2=E9=87=8D=E6=8F=90,=E5=87=BA?= =?UTF-8?q?=E8=B4=A6=E7=A7=AF=E5=88=86=E4=BD=99=E9=A2=9D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=202=EF=BC=9B=E6=B5=8B=E8=AF=95=E6=9B=B4=E6=96=B0=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=95=B0=E6=8D=AE=203;=20=E7=9F=AD=E4=BF=A1=E8=AE=A1?= =?UTF-8?q?=E6=95=B0=E5=8F=8A=E5=8F=91=E9=80=81=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/business/controller/BusAgentInfoController.java | 3 ++- .../java/com/ruoyi/business/service/impl/AiConsumer.java | 2 +- .../com/ruoyi/business/service/impl/AiServiceImpl.java | 5 +---- .../business/service/impl/BusAgentInfoServiceImpl.java | 8 +++++++- 4 files changed, 11 insertions(+), 7 deletions(-) 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 7890688..d22b1c6 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 @@ -5,6 +5,7 @@ import com.ruoyi.business.domain.BusStoreInfo; import com.ruoyi.business.service.IBusAgentInfoService; import com.ruoyi.business.service.IBusStoreInfoService; import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysDept; @@ -150,7 +151,7 @@ public class BusAgentInfoController extends BaseController { // @PreAuthorize("@ss.hasPermi('system:info:edit')") @Log(title = "代理管理", businessType = BusinessType.UPDATE) @PutMapping - @Transactional + @RepeatSubmit public AjaxResult edit(@RequestBody BusAgentInfo busAgentInfo) { LoginUser user = SecurityUtils.getLoginUser(); BusAgentInfo busAgentInfo1 = busAgentInfoService.selectBusAgentInfoById(user.getUserId()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiConsumer.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiConsumer.java index 8b13a73..fa05326 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiConsumer.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiConsumer.java @@ -228,7 +228,7 @@ public class AiConsumer { }catch (Exception e){ e.printStackTrace(); log.error("营销事件推出-下次继续====================="); - throw new ServiceException("营销事件推出-下次继续"); + throw new ServiceException("营销事件推出-下次继续:"+busOrderInfo.getOrderNo()); } System.out.println(("一共耗时time: " + (System.currentTimeMillis() - startTime) / 1000 + " s")); } 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 9d3e9cb..c9a4c76 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 @@ -319,7 +319,6 @@ public class AiServiceImpl implements IAiService { @Override @Transactional(rollbackFor = ServiceException.class) public void sendSmsTask(String content, BusOrderInfo busOrderInfo) { - lock.lock(); try { String limitNum = Optional.ofNullable(redisTemplate.opsForValue().get("limitNum")).orElse(null); BusSmsInfo busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(limitNum); @@ -351,10 +350,8 @@ public class AiServiceImpl implements IAiService { } } catch (Exception e) { e.printStackTrace(); - log.error("建立sendSmsTask错误： ",e.getMessage()); + log.error(busOrderInfo.getOrderNo()+"建立sendSmsTask错误： "+e.getMessage()); throw new ServiceException("短信发送失败！"); - }finally { - lock.unlock(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java index 0dc34a7..e1c3c91 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusAgentInfoServiceImpl.java @@ -191,19 +191,25 @@ public class BusAgentInfoServiceImpl implements IBusAgentInfoService recordService.insertBusIntegralRecord(record); busAgentInfoMapper.updateBusAgentInfo(busAgentInfo); + BusAgentInfo temp1 = busAgentInfoMapper.selectBusAgentInfoById(busAgentInfo.getSuperiorAgentCode()); BusIntegralRecord record1 = new BusIntegralRecord(); record1.setAccount(busAgentInfo.getSuperiorAgentAccount()); record1.setUpdateType("出账"); record1.setCreateUser(busAgentInfo.getAgentAccount()); // record1.setIntegralUpdateNum(busAgentInfo.getAiDurationBalance1()); if(busAgentInfo.getAiDurationBalance1()!=0){ + if(temp1.getAiDurationBalance()