From 88ae473bbc2ff93505145ad67cba9a88f58a5efa Mon Sep 17 00:00:00 2001 From: wangshuai Date: Tue, 9 Jul 2024 18:02:44 +0800 Subject: [PATCH] =?UTF-8?q?ai=20=E5=9B=9E=E8=AE=BF=20=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E8=B4=A6=E5=88=86=E9=AA=8C=E8=AF=81=EF=BC=88?= =?UTF-8?q?<=3D0=E4=B8=8D=E8=83=BD=E8=BF=9B=E8=A1=8C=E5=9B=9E=E8=AE=BF?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusAgentIntegralController.java | 6 ++--- .../BusIntegralConsumeController.java | 4 ++-- .../java/com/ruoyi/quartz/task/RyTask.java | 24 +++++++++++++++---- .../ruoyi/business/domain/BusAgentInfo.java | 6 ++--- .../business/service/impl/AiServiceImpl.java | 8 +++---- .../service/impl/SysUserServiceImpl.java | 2 +- 6 files changed, 33 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentIntegralController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentIntegralController.java index ef10e9d..4b02ecc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentIntegralController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentIntegralController.java @@ -106,10 +106,10 @@ public class BusAgentIntegralController extends BaseController record.setCreateTime(new Date()); BusAgentInfo temp = busAgentInfoService.selectBusAgentInfoById(busAgentInfo.getId()); - int oldValue = Integer.valueOf(temp.getIntegral()); + int oldValue = temp.getIntegral(); int newValue = Integer.valueOf(busAgentInfo.getIntegral1()); - busAgentInfo.setIntegral(String.valueOf(oldValue+newValue)); - record.setIntegralBalance(Integer.valueOf(oldValue+newValue)); + busAgentInfo.setIntegral(oldValue+newValue); + record.setIntegralBalance(oldValue+newValue); recordService.insertBusIntegralRecord(record); return toAjax(busAgentInfoService.updateBusAgentInfo(busAgentInfo)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java index 7d71722..c1e6930 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java @@ -60,8 +60,8 @@ public class BusIntegralConsumeController extends BaseController List list = agentInfoService.selectBusAgentInfoList(agentInfo); if (list.size() > 0){ BusAgentInfo info = list.get(0); - String integral = String.valueOf(Integer.valueOf(info.getIntegral()) - busIntegralRecord.getIntegralUpdateNum()); - Integer integral1 = Integer.valueOf(Integer.valueOf(info.getIntegral()) - busIntegralRecord.getIntegralUpdateNum()); + int integral = info.getIntegral() - busIntegralRecord.getIntegralUpdateNum(); + Integer integral1 = info.getIntegral() - busIntegralRecord.getIntegralUpdateNum(); busIntegralRecord.setIntegralBalance(integral1); info.setIntegral(integral); agentInfoService.updateBusAgentInfo(info); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java index 780a511..470f90b 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java @@ -1,11 +1,10 @@ package com.ruoyi.quartz.task; +import com.ruoyi.business.domain.BusAgentInfo; import com.ruoyi.business.domain.BusFifteenInfo; import com.ruoyi.business.domain.BusOrderInfo; -import com.ruoyi.business.service.IAiService; -import com.ruoyi.business.service.IBusFifteenInfoService; -import com.ruoyi.business.service.IBusOrderInfoService; -import com.ruoyi.business.service.IMeituanService; +import com.ruoyi.business.domain.BusStoreInfo; +import com.ruoyi.business.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -23,6 +22,10 @@ public class RyTask { @Autowired private IBusOrderInfoService orderInfoService; @Autowired + private IBusStoreInfoService storeInfoService; + @Autowired + private IBusAgentInfoService agentInfoService; + @Autowired private IAiService aiService; @Autowired private IMeituanService iMeituanService; @@ -62,6 +65,19 @@ public class RyTask { BusOrderInfo orderInfo = new BusOrderInfo(); List list = orderInfoService.selectBusOrderInfoList(orderInfo); for (BusOrderInfo busOrderInfo : list) { + + BusStoreInfo storeInfo = new BusStoreInfo(); + storeInfo.setStoreCode(busOrderInfo.getStoreCode()); + List tempStore = storeInfoService.selectBusStoreInfoList(storeInfo); + if (tempStore.size() > 0){ + BusAgentInfo agentInfo = new BusAgentInfo(); + agentInfo.setAgentAccount(tempStore.get(0).getBindUser()); + List agentInfoL = agentInfoService.selectBusAgentInfoList(agentInfo); + if (agentInfoL.size() > 0) { + if(agentInfoL.get(0).getIntegral()<=0){continue;} + }else continue; + }else continue; + BusOrderInfo temp = new BusOrderInfo(); temp.setPrivcyPhone(busOrderInfo.getPrivcyPhone()); BusOrderInfo tempInfo = orderInfoService.selectBusOrderInfoList(temp).get(0); diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java index 904ea3e..2276416 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusAgentInfo.java @@ -77,7 +77,7 @@ public class BusAgentInfo extends BaseEntity /** 登录次数 */ @Excel(name = "登录次数") private int loginNum; - private String integral; + private int integral; private String integral1; public String getIntegral1() { @@ -90,11 +90,11 @@ public class BusAgentInfo extends BaseEntity private Date createTime; - public String getIntegral() { + public int getIntegral() { return integral; } - public void setIntegral(String integral) { + public void setIntegral(int integral) { this.integral = integral; } 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 5530217..6feda8e 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 @@ -133,7 +133,7 @@ public class AiServiceImpl implements IAiService System.out.println("追加任务返回： ============taskMainId,taskMainSn===========" + taskMainId + "," + taskMainSn); - //定时任务15天后删除记录 todo + //定时任务15天之前的删除记录 todo BusFifteenInfo fifteenInfo = new BusFifteenInfo(); fifteenInfo.setCustomId(busOrderInfo.getCustomId()); fifteenInfo.setLastVisitTime(LocalDateTime.now().toString()); @@ -244,7 +244,7 @@ public class AiServiceImpl implements IAiService redisTemplate.opsForValue().set("dialTaskMainSn", taskMainSn); - //定时任务15天后删除记录 todo + //定时任务15天之前的删除记录 todo BusFifteenInfo fifteenInfo = new BusFifteenInfo(); fifteenInfo.setCustomId(busOrderInfo.getCustomId()); fifteenInfo.setLastVisitTime(LocalDateTime.now().toString()); @@ -282,8 +282,8 @@ public class AiServiceImpl implements IAiService if (agentInfoL.size() > 0) { BusAgentInfo busAgentInfo = agentInfoL.get(0); int a = (Integer.valueOf(aiInfo.getTalktimes()) / 60) + 1; - int reduce = Integer.valueOf(busAgentInfo.getIntegral()) - a; - busAgentInfo.setIntegral(String.valueOf(reduce)); + int reduce = busAgentInfo.getIntegral() - a; + busAgentInfo.setIntegral(reduce); agentInfoService.updateBusAgentInfo(busAgentInfo); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 541a7a7..6ff9669 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -284,7 +284,7 @@ public class SysUserServiceImpl implements ISysUserService busAgentInfo.setSuperiorAgentCode(loginUser.getUserId()); busAgentInfo.setSuperiorAgentAccount(loginUser.getUsername()); busAgentInfo.setDelStatus("1"); - busAgentInfo.setIntegral("0"); + busAgentInfo.setIntegral(0); busAgentInfo.setCreateTime(new Date()); busAgentInfoMapper.insertBusAgentInfo(busAgentInfo); }