From 51621e5705fdc80efebda0afb55fa99aff69d217 Mon Sep 17 00:00:00 2001 From: Lenovo Date: Wed, 10 Jul 2024 15:09:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=A8=E6=97=A5=E6=B6=88=E8=80=97=E8=B4=A6?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusAgentInfoController.java | 14 +++++++++++++ .../business/mapper/BusStoreInfoMapper.java | 18 +++++++++------- .../service/IBusStoreInfoService.java | 17 ++++++++------- .../business/service/impl/AiServiceImpl.java | 10 +++++++++ .../service/impl/BusStoreInfoServiceImpl.java | 21 ++++++++++++------- .../mapper/business/BusStoreInfoMapper.xml | 16 +++++++++----- 6 files changed, 67 insertions(+), 29 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 387b743..537f8ec 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 @@ -1,5 +1,8 @@ package com.ruoyi.business.controller; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -74,6 +77,17 @@ public class BusAgentInfoController extends BaseController busStoreInfo.setBindUser(bean.getAgentAccount()); List ll = iBusStoreInfoService.selectBusStoreInfoList(busStoreInfo); bean.setGrantStoreNum(ll.size()); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DAY_OF_MONTH,-1); + Date minusDay = calendar.getTime(); + String date = sdf.format(minusDay); + String startTime = date+" 00:00:00"; + String endTime = date+" 23:59:59"; + int lastUserIntegralNum = iBusStoreInfoService.lastUserIntegralNum(busAgentInfo.getAgentAccount(),startTime,endTime); + bean.setLastUseIntegralNum(lastUserIntegralNum); + 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 b73e749..a413674 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 @@ -2,18 +2,19 @@ package com.ruoyi.business.mapper; import java.util.List; import com.ruoyi.business.domain.BusStoreInfo; +import org.apache.ibatis.annotations.Param; /** * 店铺信息Mapper接口 - * + * * @author ruoyi * @date 2024-07-03 */ -public interface BusStoreInfoMapper +public interface BusStoreInfoMapper { /** * 查询店铺信息 - * + * * @param id 店铺信息主键 * @return 店铺信息 */ @@ -21,15 +22,16 @@ public interface BusStoreInfoMapper /** * 查询店铺信息列表 - * + * * @param busStoreInfo 店铺信息 * @return 店铺信息集合 */ public List selectBusStoreInfoList(BusStoreInfo busStoreInfo); + int lastUserIntegralNum(@Param("agentAccount") String agentAccount,@Param("startTime") String startTime,@Param("endTime") String endTime); /** * 新增店铺信息 - * + * * @param busStoreInfo 店铺信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface BusStoreInfoMapper /** * 修改店铺信息 - * + * * @param busStoreInfo 店铺信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface BusStoreInfoMapper /** * 删除店铺信息 - * + * * @param id 店铺信息主键 * @return 结果 */ @@ -53,7 +55,7 @@ public interface BusStoreInfoMapper /** * 批量删除店铺信息 - * + * * @param ids 需要删除的数据主键集合 * @return 结果 */ 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 988e55d..3ea8600 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 @@ -7,15 +7,15 @@ import com.ruoyi.business.domain.BusStoreInfo; /** * 店铺信息Service接口 - * + * * @author ruoyi * @date 2024-07-03 */ -public interface IBusStoreInfoService +public interface IBusStoreInfoService { /** * 查询店铺信息 - * + * * @param id 店铺信息主键 * @return 店铺信息 */ @@ -31,15 +31,16 @@ public interface IBusStoreInfoService /** * 查询店铺信息列表 - * + * * @param busStoreInfo 店铺信息 * @return 店铺信息集合 */ public List selectBusStoreInfoList(BusStoreInfo busStoreInfo); + int lastUserIntegralNum(String agentAccount,String startTime,String endTime); /** * 新增店铺信息 - * + * * @param busStoreInfo 店铺信息 * @return 结果 */ @@ -47,7 +48,7 @@ public interface IBusStoreInfoService /** * 修改店铺信息 - * + * * @param busStoreInfo 店铺信息 * @return 结果 */ @@ -55,7 +56,7 @@ public interface IBusStoreInfoService /** * 批量删除店铺信息 - * + * * @param ids 需要删除的店铺信息主键集合 * @return 结果 */ @@ -63,7 +64,7 @@ public interface IBusStoreInfoService /** * 删除店铺信息信息 - * + * * @param id 店铺信息主键 * @return 结果 */ 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 87aa126..4885789 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 @@ -43,6 +43,8 @@ public class AiServiceImpl implements IAiService @Autowired private IBusFifteenInfoService fifteenInfoService; @Autowired + private IBusIntegralRecordService integralRecordService; + @Autowired private StringRedisTemplate redisTemplate; private String userSn = "SYSUSER|8398f13f3feccef770ee4d465fe22fbf"; @@ -302,6 +304,14 @@ public class AiServiceImpl implements IAiService int reduce = busAgentInfo.getIntegral() - a; busAgentInfo.setIntegral(reduce); agentInfoService.updateBusAgentInfo(busAgentInfo); + + BusIntegralRecord record = new BusIntegralRecord(); + record.setAccount(busAgentInfo.getAgentAccount()); + record.setIntegralUpdateTime(new Date()); + record.setUpdateType("消耗账分"); + record.setIntegralUpdateNum(a); + record.setIntegralBalance(reduce); + integralRecordService.updateBusIntegralRecord(record); } } } 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 f5fb123..4dba510 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 @@ -18,12 +18,12 @@ import org.springframework.transaction.annotation.Transactional; /** * 店铺信息Service业务层处理 - * + * * @author ruoyi * @date 2024-07-03 */ @Service -public class BusStoreInfoServiceImpl implements IBusStoreInfoService +public class BusStoreInfoServiceImpl implements IBusStoreInfoService { @Autowired private BusStoreInfoMapper busStoreInfoMapper; @@ -36,7 +36,7 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService /** * 查询店铺信息 - * + * * @param id 店铺信息主键 * @return 店铺信息 */ @@ -53,7 +53,7 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService /** * 查询店铺信息列表 - * + * * @param busStoreInfo 店铺信息 * @return 店铺信息 */ @@ -63,9 +63,14 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService return busStoreInfoMapper.selectBusStoreInfoList(busStoreInfo); } + @Override + public int lastUserIntegralNum(String agentAccount,String startTime,String endTime){ + return busStoreInfoMapper.lastUserIntegralNum(agentAccount, startTime, endTime); + } + /** * 新增店铺信息 - * + * * @param busStoreInfo 店铺信息 * @return 结果 */ @@ -77,7 +82,7 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService /** * 修改店铺信息 - * + * * @param busStoreInfo 店铺信息 * @return 结果 */ @@ -90,7 +95,7 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService /** * 批量删除店铺信息 - * + * * @param ids 需要删除的店铺信息主键 * @return 结果 */ @@ -102,7 +107,7 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService /** * 删除店铺信息信息 - * + * * @param id 店铺信息主键 * @return 结果 */ diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml index ea1eb17..03a4567 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -32,9 +32,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, platform_type, store_code, store_name, store_account, store_password, store_cookie, store_belong, grant_status, return_visit_status, bind_id, bind_user, bind_time, update_id, update_user, update_time, self_delivery_status, return_visit_user_range, sale_bind_id, sale_bind_name, sale_bind_time from bus_store_info + + - +