From aa30813cc7ea7df55b842c6dbe438178439a4cf0 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Thu, 22 Aug 2024 14:13:50 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E4=BC=98=E5=8C=96=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E4=BD=99=E9=A2=9D=E4=BF=AE=E6=94=B9=202=EF=BC=9B=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=90=A5=E9=94=80=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?sql=203=EF=BC=9B=E6=B5=81=E6=B0=B4=E5=AF=BC=E5=87=BA=204?= =?UTF-8?q?=EF=BC=9B=E5=9B=9E=E8=AE=BF=E6=95=B0=E6=8D=AE=E9=A1=B5=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusIntegralRecordController.java | 7 +++++-- .../business/service/impl/AiServiceImpl.java | 1 - .../mapper/business/BusOrderInfoMapper.xml | 16 ++++++++++------ ruoyi-ui/src/views/point/detail/index.vue | 7 +++++++ ruoyi-ui/src/views/statistics/visit/index.vue | 2 +- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralRecordController.java index 240aa1b..c536105 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralRecordController.java @@ -68,12 +68,15 @@ public class BusIntegralRecordController extends BaseController /** * 导出积分变更记录列表 */ - @PreAuthorize("@ss.hasPermi('system:record:export')") +// @PreAuthorize("@ss.hasPermi('system:record:export')") @Log(title = "积分变更记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, BusIntegralRecord busIntegralRecord) { - List list = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord); + if(!"admin".equals(SecurityUtils.getLoginUser().getUsername())){ + busIntegralRecord.setAccount(SecurityUtils.getLoginUser().getUsername()); + } + List list = busIntegralRecordService.selectBusIntegralRecordListA(busIntegralRecord); ExcelUtil util = new ExcelUtil(BusIntegralRecord.class); util.exportExcel(response, list, "积分变更记录数据"); } 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 9f7e41f..a4e26b5 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 @@ -328,7 +328,6 @@ public class AiServiceImpl implements IAiService { } @Override - @Transactional(rollbackFor = ServiceException.class) public Boolean sendSmsTask(String content, BusOrderInfo busOrderInfo) { try { String limitNum = Optional.ofNullable(redisTemplate.opsForValue().get("limitNum")).orElse(null); diff --git a/ruoyi-system/src/main/resources/mapper/business/BusOrderInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusOrderInfoMapper.xml index f66b749..097d7bc 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusOrderInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusOrderInfoMapper.xml @@ -57,10 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN bus_order_info a on b.phone_number=a.privcy_phone where b.return_visit_time is null and b.phone_number != '' and a.store_code = #{storeCode} - and a.complete_time > #{t1} - and a.complete_time <= #{t2} +-- and a.complete_time > #{t1} +-- and a.complete_time <= #{t2} + and a.complete_time between #{t1} and #{t2} GROUP BY a.privcy_phone,a.order_no - ) AS t2 ON t1.order_no = t2.order_no AND t1.id = t2.min_id; + ) AS t2 ON t1.order_no = t2.order_no AND t1.id = t2.min_id + order by t1.complete_time