src/main/java/cc/mrbird/febs/mall/controller/activity/AdminVotesActivityCategoryController.java
@@ -17,6 +17,7 @@ import cc.mrbird.febs.mall.entity.HappyActivityOption; import cc.mrbird.febs.mall.entity.HappyActivityOrder; import cc.mrbird.febs.mall.service.IAdminHappyActivityService; import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -364,4 +365,77 @@ ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, false); } /** * 核销记录列表 * @return */ @GetMapping("activityOrderCheckList") public FebsResponse activityOrderCheckList(AdminHappyActivityOrderCheckDto dto, QueryRequest request) { Map<String, Object> data = getDataTable(adminHappyActivityService.activityOrderCheckList(dto, request)); return new FebsResponse().success().data(data); } /** * 核销记录-手动核销 */ @PostMapping("checkOrderItem") @ControllerEndpoint(operation = "核销记录-手动核销", exceptionMessage = "操作失败") public FebsResponse checkOrderItem(@RequestBody List<Long> dto) { return adminHappyActivityService.checkOrderItem(dto); } @SneakyThrows @GetMapping("/exportOrderCheckList") public void exportOrderCheckList(@RequestParam Map<String, String> params, HttpServletResponse response) { //获取查询参数 if(ObjectUtil.isEmpty(params.get("activityId"))){ throw new FebsException("请选择活动"); } String activityId = params.get("activityId"); HappyActivity happyActivity = adminHappyActivityService.getBaseMapper().selectById(activityId); if(ObjectUtil.isEmpty(happyActivity)){ throw new FebsException("活动不存在"); } List<ExcelSheetPO> res = new ArrayList<>(); ExcelSheetPO orderSheet = new ExcelSheetPO(); String title = happyActivity.getName() + "的核销记录"; orderSheet.setTitle(title); String[] header = {"序号", "票号","参与人","电话", "地址","使用状态","核销时间","核销员", "姓名", "联系方式"}; orderSheet.setHeaders(header); List<AdminHappyActivityOrderCheckVo> orderListForExport = adminHappyActivityService.getOrderCheckListForExport(params); List<List<Object>> list = new ArrayList<>(); if (orderListForExport.size() > 0) { int i = 0; for (AdminHappyActivityOrderCheckVo item : orderListForExport) { i++; List<Object> temp = new ArrayList<>(); temp.add(i); temp.add(item.getCode()); temp.add(item.getName()); temp.add(item.getPhone()); temp.add(item.getAddress()); temp.add(item.getState() == 1 ? "已使用" : "待使用"); temp.add(item.getState() == 1 ? item.getUpdatedTime() : ""); temp.add(item.getCheckName()); temp.add(item.getCheckRealName()); temp.add(item.getCheckPhone()); list.add(temp); } } orderSheet.setDataList(list); res.add(orderSheet); response = ResponseHeadUtil.setExcelHead(response); response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(title + DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN) + ".xlsx".trim(), "UTF-8")); OutputStream os = null; os = response.getOutputStream(); ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, false); } } src/main/java/cc/mrbird/febs/mall/controller/activity/ViewHappyActivityController.java
@@ -158,4 +158,15 @@ public String commentList() { return FebsUtil.view("modules/votesActivity/commentList"); } /** * 核销记录-列表 */ @GetMapping("checkOrderList") @RequiresPermissions("checkOrderList:view") public String checkOrderList() { return FebsUtil.view("modules/votesActivity/checkOrderList"); } } src/main/java/cc/mrbird/febs/mall/dto/activity/AdminHappyActivityOrderCheckDto.java
New file @@ -0,0 +1,11 @@ package cc.mrbird.febs.mall.dto.activity; import lombok.Data; @Data public class AdminHappyActivityOrderCheckDto { private String name; private String code; private Integer state; private Long activityId; } src/main/java/cc/mrbird/febs/mall/mapper/HappyActivityMapper.java
@@ -9,6 +9,7 @@ import cc.mrbird.febs.mall.vo.ApiActivityOptionListVo; import cc.mrbird.febs.mall.vo.ApiVoteRecordInPageVo; import cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo; import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo; import cc.mrbird.febs.mall.vo.activity.ApiActivityCommentVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -36,4 +37,8 @@ List<ApiActivityCommentVo> selectActivityCommentPage(Page<ApiActivityCommentVo> page, @Param("record")ApiActivityCommentDto dto); IPage<AdminActivityCommentVo> getCommentListInPage(Page<AdminActivityCommentVo> page, @Param("record")AdminActivityCommentDto dto); IPage<AdminHappyActivityOrderCheckVo> activityOrderCheckList(Page<AdminHappyActivityOrderCheckVo> page, @Param("record")AdminHappyActivityOrderCheckDto dto); List<AdminHappyActivityOrderCheckVo> getOrderCheckListForExport(Long activityId); } src/main/java/cc/mrbird/febs/mall/service/IAdminHappyActivityService.java
@@ -6,6 +6,7 @@ import cc.mrbird.febs.mall.dto.activity.*; import cc.mrbird.febs.mall.entity.*; import cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo; import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -66,4 +67,10 @@ FebsResponse showStateSwitchOn(Long id); List<HappyActivityOrder> getOrderListForExport(Map<String, String> params); IPage<AdminHappyActivityOrderCheckVo> activityOrderCheckList(AdminHappyActivityOrderCheckDto dto, QueryRequest request); FebsResponse checkOrderItem(List<Long> dto); List<AdminHappyActivityOrderCheckVo> getOrderCheckListForExport(Map<String, String> params); } src/main/java/cc/mrbird/febs/mall/service/impl/AdminHappyActivityServiceImpl.java
@@ -12,8 +12,10 @@ import cc.mrbird.febs.mall.service.IAdminHappyActivityService; import cc.mrbird.febs.mall.vo.AdminMallGoodsCommentVo; import cc.mrbird.febs.mall.vo.activity.AdminActivityCommentVo; import cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -386,6 +388,7 @@ if(CollUtil.isNotEmpty(happyActivityOrderItems)){ happyActivityOrderItems.forEach(happyActivityOrderItem -> { happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode()); happyActivityOrderItem.setUpdatedTime(DateUtil.date()); happyActivityOrderItemMapper.updateById(happyActivityOrderItem); }); } @@ -476,4 +479,38 @@ } return happyActivityOrders; } @Override public IPage<AdminHappyActivityOrderCheckVo> activityOrderCheckList(AdminHappyActivityOrderCheckDto dto, QueryRequest request) { Page<AdminHappyActivityOrderCheckVo> page = new Page<>(request.getPageNum(), request.getPageSize()); IPage<AdminHappyActivityOrderCheckVo> adminHappyActivityOrderCheckVoIPage = this.baseMapper.activityOrderCheckList(page, dto); return adminHappyActivityOrderCheckVoIPage; } @Override public FebsResponse checkOrderItem(List<Long> ids) { if (CollUtil.isEmpty(ids)){ return new FebsResponse().fail().message("请选择需要核销的订单"); } List<HappyActivityOrderItem> happyActivityOrderItems = happyActivityOrderItemMapper.selectList( new LambdaQueryWrapper<HappyActivityOrderItem>() .in(HappyActivityOrderItem::getId, ids) .eq(HappyActivityOrderItem::getState, StateUpDownEnum.DOWN.getCode()) ); if(CollUtil.isNotEmpty(happyActivityOrderItems)){ happyActivityOrderItems.forEach(happyActivityOrderItem -> { happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode()); happyActivityOrderItem.setUpdatedTime(DateUtil.date()); happyActivityOrderItemMapper.updateById(happyActivityOrderItem); }); } return new FebsResponse().success().message("操作成功"); } @Override public List<AdminHappyActivityOrderCheckVo> getOrderCheckListForExport(Map<String, String> params) { return this.baseMapper.getOrderCheckListForExport(Long.valueOf(params.get("activityId"))); } } src/main/java/cc/mrbird/febs/mall/service/impl/HappyActivityServiceImpl.java
@@ -953,6 +953,7 @@ happyActivityOrderItem.setState(StateUpDownEnum.UP.getCode()); happyActivityOrderItem.setTransferItemId(memberId); happyActivityOrderItem.setUpdatedTime(DateUtil.date()); happyActivityOrderItemMapper.updateById(happyActivityOrderItem); agentProducer.sendCheckActivityItem(happyActivityOrderItem.getOrderId()); return new FebsResponse().success().message("操作成功"); src/main/java/cc/mrbird/febs/mall/vo/activity/AdminHappyActivityOrderCheckVo.java
New file @@ -0,0 +1,25 @@ package cc.mrbird.febs.mall.vo.activity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.math.BigDecimal; import java.util.Date; @Data public class AdminHappyActivityOrderCheckVo { private String checkName; private String checkRealName; private String checkPhone; private Long id; private String code; private String name; private String phone; private String address; private Integer state; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updatedTime; } src/main/resources/mapper/modules/HappyActivityOptionMapper.xml
@@ -177,4 +177,56 @@ order by a.created_time desc </select> <select id="activityOrderCheckList" resultType="cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo"> select a.id, a.code, a.name, a.phone, a.address, a.state, CASE WHEN a.state = 1 THEN a.UPDATED_TIME ELSE NULL END AS updatedTime, b.name checkName, b.phone checkPhone, b.real_name checkRealName from happy_activity_order_item a left join mall_member b on b.id = a.transfer_item_id <where> and a.code is not null <if test="record != null"> <if test="record.name != null and record.name != ''"> and (b.name like CONCAT('%', CONCAT(#{record.name}, '%')) or b.real_name like CONCAT('%', CONCAT(#{record.name}, '%'))) </if> <if test="record.code != null and record.code != ''"> and a.code = #{record.code} </if> <if test="record.state != null"> and a.state=#{record.state} </if> <if test="record.activityId != null"> and a.activity_id=#{record.activityId} </if> </if> </where> order by a.created_time desc </select> <select id="getOrderCheckListForExport" resultType="cc.mrbird.febs.mall.vo.activity.AdminHappyActivityOrderCheckVo"> select a.*, b.name checkName, b.phone checkPhone, b.real_name checkRealName from happy_activity_order_item a left join mall_member b on b.id = a.transfer_item_id where a.code is not null and a.activity_id=#{activityId} order by a.created_time desc </select> </mapper> src/main/resources/templates/febs/views/modules/system/indexPng.html
@@ -31,7 +31,7 @@ <div class="layui-input-block"> <input type="text" name="timeStop" autocomplete="off" class="layui-input" > <div class="layui-form-mid layui-word-aux">5：表示显示5秒后自动关闭。</div> <div class="layui-form-mid layui-word-aux">5：表示显示5秒后自动关闭,注意：此处单张图片切换的默认时间为2秒，所以关闭时间等于开屏页图片数量*2，不宜过多。</div> </div> </div> </div> src/main/resources/templates/febs/views/modules/votesActivity/checkOrderList.html
New file @@ -0,0 +1,275 @@ <div class="layui-fluid layui-anim febs-anim" id="febs-activity-order-check" lay-title="核销管理"> <div class="layui-row febs-container"> <div class="layui-col-md12"> <div class="layui-card"> <div class="layui-card-body febs-table-full"> <form class="layui-form layui-table-form" lay-filter="activity-order-check-table-form"> <div class="layui-row"> <div class="layui-col-md10"> <div class="layui-form-item"> <div class="layui-inline"> <label class="layui-form-label layui-form-label-sm">核销员名</label> <div class="layui-input-inline"> <input type="text" placeholder="核销员名称" name="name" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label layui-form-label-sm">票号</label> <div class="layui-input-inline"> <input type="text" placeholder="票号" name="code" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> <label class="layui-form-label layui-form-label-sm">使用状态</label> <div class="layui-input-inline"> <select name="state"> <option value="">请选择</option> <option value="0">待使用</option> <option value="1">已使用</option> </select> </div> </div> <div class="layui-inline"> <label class="layui-form-label layui-form-label-sm">活动</label> <div class="layui-input-inline"> <select name="activityId" class="activity-check-type"> <option value="">请选择</option> </select> </div> </div> </div> </div> <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area"> <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="query"> <i class="layui-icon"></i> </div> <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset"> <i class="layui-icon"></i> </div> <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain table-action" id="export" title="导出"> <i class="layui-icon"></i> </div> </div> </div> </form> <table lay-filter="orderActivityCheckTable" lay-data="{id: 'orderActivityCheckTable'}"></table> </div> </div> </div> </div> </div> <!-- 表格操作栏 start --> <script type="text/html" id="user-option"> <span shiro:lacksPermission="list:view,add:add,votesActivityUpdate:update"> <span class="layui-badge-dot febs-bg-orange"></span> 无权限 </span> <a lay-event="edit" shiro:hasPermission="votesActivityUpdate:update"><i class="layui-icon febs-edit-area febs-blue"></i></a> </script> <script type="text/html" id="orderActivityCheckToolbar"> <div class="layui-btn-container"> <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="orderActivity:update" lay-event="checkOrder">手动核销</button> </div> </script> <script type="text/html" id="orderActivityCheckOption"> <!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" shiro:hasPermission="orderActivity:info" lay-event="orderActivity">详情</button>--> <!-- <button class="layui-btn layui-btn-danger layui-btn-sm" type="button" shiro:hasPermission="orderActivity:info" lay-event="orderActivityDel">删除</button>--> <!-- <button class="layui-btn layui-btn-danger layui-btn-sm" type="button" shiro:hasPermission="orderActivity:returnOrder" lay-event="returnOrder">售后退款</button>--> </script> <script type="text/html" id="orderItemStateOption"> {{# var state = { 1: {title: '已使用', color: 'green'}, 0: {title: '待使用', color: 'blue'}, }[d.state]; }} <span class="layui-badge febs-bg-{{state.color}}">{{ state.title }}</span> </script> <style> .layui-form-onswitch { background-color: #5FB878 !important; } </style> <!-- 表格操作栏 end --> <script data-th-inline="none" type="text/javascript"> // 引入组件并初始化 layui.use([ 'jquery', 'form', 'table', 'febs'], function () { var $ = layui.jquery, febs = layui.febs, form = layui.form, table = layui.table, $view = $('#febs-activity-order-check'), $query = $view.find('#query'), $reset = $view.find('#reset'), $export= $view.find('#export'), $searchForm = $view.find('form'), sortObject = {field: 'id', type: null}, tableIns; form.render(); //(下拉框) $.get(ctx + 'admin/happyActivity/allOrderActivities', function (res) { var data = res.data; for (let k in data) { $(".activity-check-type").append("<option value='" + data[k].id + "'>" + data[k].name + "</option>"); } layui.use('form', function () { var form = layui.form; form.render(); }); }); // 表格初始化 initorderActivityCheckTable(); // 初始化表格操作栏各个按钮功能 table.on('tool(orderActivityCheckTable)', function (obj) { var data = obj.data, layEvent = obj.event; }); function orderActivityDel(id) { febs.get(ctx + 'admin/happyActivity/activityOrderDel/' + id, null, function (data) { febs.alert.success(data.message); $query.click(); }); } // 初始化表格操作栏各个按钮功能 table.on('toolbar(orderActivityCheckTable)', function (obj) { let event = obj.event; let id = obj.config.id; let checkStatus = table.checkStatus(id); if (event === 'checkOrder') { let data = checkStatus.data; // 校验 data 是否为空或未定义 if (!Array.isArray(data) || data.length === 0) { febs.alert.warn('请选择需要核销的订单'); return; } let ids = []; let hasInvalidOrder = false; // 遍历数据，筛选符合条件的订单 for (let i = 0; i < data.length; i++) { if (data[i].state !== 1) { hasInvalidOrder = true; break; // 提前中断循环，避免无意义的继续遍历 } else { ids.push(data[i].id); } } if (hasInvalidOrder) { febs.alert.warn('请选择待使用的订单'); return; } if (ids.length === 0) { // 正确判断数组是否为空 febs.alert.warn('请选择需要核销的订单'); return; } // 封装 AJAX 请求为独立函数 function sendCheckOrderRequest(ids, successCallback, errorCallback) { $.ajax({ url: ctx + 'admin/happyActivity/checkOrderItem', // 硬编码路径建议提取为配置项 type: 'post', dataType: 'json', headers: { 'Content-Type': 'application/json;charset=utf-8' }, traditional: true, data: JSON.stringify(ids), // 确保传递的是 JSON 格式 success: function (response) { if (response.code === 200) { successCallback(response); } else { errorCallback(response.message); } }, error: function (xhr, status, error) { errorCallback(`服务器繁忙: ${error}`); // 捕获具体错误信息 } }); } // 调用封装的请求函数 sendCheckOrderRequest(ids, function onSuccess(response) { febs.alert.success('操作成功'); $query.click(); }, function onError(message) { febs.alert.warn(message); } ); } }); function initorderActivityCheckTable() { tableIns = febs.table.init({ elem: $view.find('table'), id: 'orderActivityCheckTable', url: ctx + 'admin/happyActivity/activityOrderCheckList', toolbar:"#orderActivityCheckToolbar", defaultToolbar:[], cols: [[ {type: 'checkbox'}, {type: 'numbers', title: '', width: 80}, {field: 'name', title: '参与人', minWidth: 100,align:'center'}, {field: 'phone', title: '电话', minWidth: 100,align:'center'}, {field: 'address', title: '地址', minWidth: 100,align:'center'}, {field: 'code', title: '票号', minWidth: 100,align:'center'}, {title: '使用状态', templet: '#orderItemStateOption', minWidth: 100,align:'center'}, // {title: '操作', toolbar: '#orderActivityCheckOption', minWidth: 200, align: 'center'}, {field: 'checkName', title: '核销员', minWidth: 100,align:'center'}, {field: 'checkRealName', title: '真实姓名', minWidth: 100,align:'center'}, {field: 'checkPhone', title: '联系方式', minWidth: 100,align:'center'}, {field: 'updatedTime', title: '核销时间', minWidth: 150,align:'left'} ]] }); } // 导出功能 $export.on('click', function () { var params = getQueryParams(); let activityId = $searchForm.find("select[name='activityId']").val(); //如果活动ID为空，弹出提示请选择活动 if (activityId == null || activityId == '') { febs.alert.warn('请选择活动'); return; } var queryString = Object.keys(params).map(key => `${key}=${encodeURIComponent(params[key])}`).join('&'); window.location.href = ctx + 'admin/happyActivity/exportOrderCheckList?' + queryString; }); // 查询按钮 $query.on('click', function () { var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type}); tableIns.reload({where: params, page: {curr: 1}}); }); // 刷新按钮 $reset.on('click', function () { $searchForm[0].reset(); sortObject.type = 'null'; tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject}); }); // 获取查询参数 function getQueryParams() { return { name: $searchForm.find('input[name="name"]').val().trim(), code: $searchForm.find('input[name="code"]').val().trim(), state: $searchForm.find("select[name='state']").val(), activityId: $searchForm.find("select[name='activityId']").val(), }; } }) </script>
