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