src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
New file @@ -0,0 +1,70 @@ package cc.mrbird.febs.mall.controller; import cc.mrbird.febs.common.controller.BaseController; import cc.mrbird.febs.common.entity.FebsResponse; import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.mall.dto.MallOrderInfoDto; import cc.mrbird.febs.mall.entity.MallGoods; import cc.mrbird.febs.mall.entity.MallOrderInfo; import cc.mrbird.febs.mall.service.IAdminMallGoodsService; import cc.mrbird.febs.mall.service.IAdminMallOrderService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.Map; @Slf4j @Validated @RestController @RequiredArgsConstructor @RequestMapping(value = "/admin/order") public class AdminMallOrderController extends BaseController { private final IAdminMallOrderService adminMallOrderService; /** * 商品列表 * @param mallOrderInfo * @param request * @return */ @GetMapping("orderList") public FebsResponse getOrderList(MallOrderInfoDto mallOrderInfo, QueryRequest request) { Map<String, Object> data = getDataTable(adminMallOrderService.getOrderListInPage(mallOrderInfo, request)); return new FebsResponse().success().data(data); } } src/main/java/cc/mrbird/febs/mall/controller/ViewMallGoodsController.java
@@ -28,7 +28,7 @@ */ @GetMapping("goodsList") @RequiresPermissions("goodsList:view") public String categoryList() { public String goodsList() { return FebsUtil.view("modules/goods/goodsList"); } @@ -38,7 +38,7 @@ */ @GetMapping("goodsAdd") @RequiresPermissions("goodsAdd:add") public String helpCenterAdd() { public String goodsAdd() { return FebsUtil.view("modules/goods/goodsAddNew"); }
New file @@ -0,0 +1,48 @@ package cc.mrbird.febs.mall.controller; import cc.mrbird.febs.common.controller.BaseController; import cc.mrbird.febs.common.entity.FebsConstant; import cc.mrbird.febs.common.utils.FebsUtil; import cc.mrbird.febs.mall.service.IAdminMallOrderService; import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryVo; import cc.mrbird.febs.mall.vo.AdminMallOrderVo; import lombok.RequiredArgsConstructor; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @Controller("orderView") @RequestMapping(FebsConstant.VIEW_PREFIX + "modules/order") @RequiredArgsConstructor public class ViewMallOrderController extends BaseController { private final IAdminMallOrderService adminMallOrderService; /** * 订单列表 * @return */ @GetMapping("orderList") @RequiresPermissions("orderList:view") public String orderList() { return FebsUtil.view("modules/order/orderList"); } /** * 订单-发货 * @param id * @param model * @return */ @GetMapping("deliverGoods/{id}") @RequiresPermissions("deliverGoods:update") public String deliverGoods(@PathVariable long id, Model model) { AdminMallOrderVo data = adminMallOrderService.getMallOrderInfoById(id); model.addAttribute("orderInfo", data); return FebsUtil.view("modules/order/deliverGoods"); } } src/main/java/cc/mrbird/febs/mall/dto/MallOrderInfoDto.java
New file @@ -0,0 +1,25 @@ package cc.mrbird.febs.mall.dto; import io.swagger.annotations.ApiModel; import lombok.Data; @Data @ApiModel(value = "MallOrderInfoDto", description = "参数接收类") public class MallOrderInfoDto { private String payResult; /** * 状态 1-待支付 2-待发货 3-待收货 4-已完成 5-退款中 6-已退款 7-已取消 */ private Integer status; /** * 取消类型 1-超时未支付 2-主动取消 */ private Integer cancelType; private String orderNo; private String name; } src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
@@ -1,7 +1,12 @@ package cc.mrbird.febs.mall.mapper; import cc.mrbird.febs.mall.dto.MallOrderInfoDto; import cc.mrbird.febs.mall.entity.MallOrderInfo; import cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo; import cc.mrbird.febs.mall.vo.AdminMallOrderVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; /** @@ -11,4 +16,8 @@ public interface MallOrderInfoMapper extends BaseMapper<MallOrderInfo> { MallOrderInfo selectOrderByMemberIdAndId(@Param("memberId") Long memberId, @Param("id") Long id); IPage<AdminMallOrderInfoVo> selectOrderListInPage(Page<AdminMallOrderInfoVo> page, @Param("record") MallOrderInfoDto mallOrderInfo); AdminMallOrderVo getMallOrderInfoById(@Param("id")long id); } src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java
New file @@ -0,0 +1,16 @@ package cc.mrbird.febs.mall.service; import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.mall.dto.MallOrderInfoDto; import cc.mrbird.febs.mall.entity.MallOrderInfo; import cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo; import cc.mrbird.febs.mall.vo.AdminMallOrderVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; public interface IAdminMallOrderService extends IService<MallOrderInfo> { IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request); AdminMallOrderVo getMallOrderInfoById(long id); } src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
New file @@ -0,0 +1,35 @@ package cc.mrbird.febs.mall.service.impl; import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.mall.dto.MallOrderInfoDto; import cc.mrbird.febs.mall.entity.MallOrderInfo; import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper; import cc.mrbird.febs.mall.service.IAdminMallOrderService; import cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo; import cc.mrbird.febs.mall.vo.AdminMallOrderVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Slf4j @Service @RequiredArgsConstructor public class AdminMallOrderService extends ServiceImpl<MallOrderInfoMapper, MallOrderInfo> implements IAdminMallOrderService { private final MallOrderInfoMapper mallOrderInfoMapper; @Override public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) { Page<AdminMallOrderInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize()); IPage<AdminMallOrderInfoVo> adminMallOrderInfoVos = this.baseMapper.selectOrderListInPage(page, mallOrderInfo); return adminMallOrderInfoVos; } @Override public AdminMallOrderVo getMallOrderInfoById(long id) { return this.baseMapper.getMallOrderInfoById(id); } } src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
New file @@ -0,0 +1,65 @@ package cc.mrbird.febs.mall.vo; import io.swagger.annotations.ApiModel; import lombok.Data; import java.math.BigDecimal; import java.util.Date; @Data @ApiModel(value = "AdminMallOrderInfoVo", description = "信息返回类") public class AdminMallOrderInfoVo { private Long id; private String orderNo; private Long memberId; private Date orderTime; private Date payTime; private BigDecimal amount; private String payMethod; private String payOrderNo; private String payResult; /** * 状态 1-待支付2-待发货3-待收货4-已完成5-退款中6-已退款7-已取消 */ private Integer status; /** * 取消类型 1-超时未支付2-主动取消 */ private Integer cancelType; public static final Integer CANCEL_OVERTIME_NO_PAY = 1; public static final Integer CANCEL_BY_SELF = 2; private String name; private String phone; private String address; private String longitude; private String latitude; private String remark; private Integer delFlag; /** * 购买人姓名 */ private String memberName; private String memberPhone; private String memberEmail; } src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderVo.java
New file @@ -0,0 +1,17 @@ package cc.mrbird.febs.mall.vo; import io.swagger.annotations.ApiModel; import lombok.Data; @Data @ApiModel(value = "AdminMallOrderVo", description = "信息返回类") public class AdminMallOrderVo { private Long id; private String name; private String phone; private String address; } src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -5,4 +5,33 @@ <select id="selectOrderByMemberIdAndId" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo"> select * from mall_order_info where member_id=#{memberId} and id=#{id} </select> <select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo"> select * from mall_order_info a left join mall_member b on a.member_id = b.id <where> a.del_flag=2 <if test="record != null"> <if test="record.payResult != null and record.payResult != ''"> and a.pay_result = #{record.payResult} </if> <if test="record.status != null and record.status != ''"> and a.status = #{record.status} </if> <if test="record.orderNo != null and record.orderNo != ''"> and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%')) </if> <if test="record.name != null and record.name != ''"> and b.name like CONCAT('%', CONCAT(#{record.name}, '%')) </if> </if> </where> order by a.created_time desc </select> <select id="getMallOrderInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderVo"> select * from mall_order_info where id = #{id} </select> </mapper> src/main/resources/templates/febs/views/modules/order/deliverGoods.html
New file @@ -0,0 +1,10 @@ <!DOCTYPE html> <html lang="en"> <head> <meta charset="UTF-8"> <title>Title</title> </head> <body> </body> </html> src/main/resources/templates/febs/views/modules/order/orderList.html
New file @@ -0,0 +1,213 @@ <div class="layui-fluid layui-anim febs-anim" id="febs-order" 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="user-table-form"> <div class="layui-form-item"> <div class="layui-col-md10"> <div class="layui-inline"> <div class="layui-input-inline"> <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input type="text" placeholder="订单编号" name="orderNo" 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="status"> <option value="">请选择</option> <option value="1">待支付</option> <option value="2">待发货</option> <option value="3">待收货</option> <option value="4">已完成</option> <option value="5">退款中</option> <option value="6">已退款</option> <option value="7">已取消</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="payResult"> <option value="">请选择</option> <option value="1">成功</option> <option value="2">未成功</option> </select> </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> </div> </form> <table lay-filter="orderTable" lay-data="{id: 'orderTable'}"></table> </div> </div> </div> </div> </div> <!-- 表格操作栏 start --> <script type="text/html" id="user-option"> <span shiro:lacksPermission="user:view,user:update,user:delete"> <span class="layui-badge-dot febs-bg-orange"></span> 无权限 </span> <a lay-event="edit" shiro:hasPermission="user:update"><i class="layui-icon febs-edit-area febs-blue"></i></a> </script> <!-- 表格操作栏 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-order'), $query = $view.find('#query'), $reset = $view.find('#reset'), $searchForm = $view.find('form'), $add = $view.find('#add'), sortObject = {field: 'phone', type: null}, tableIns; form.render(); // 表格初始化 initTable(); // 初始化表格操作栏各个按钮功能 table.on('tool(orderTable)', function (obj) { var data = obj.data, layEvent = obj.event; if (layEvent === 'downGoods') { febs.modal.confirm('下架', '确认下架该商品？', function () { downGoods(data.id); }); } if (layEvent === 'upGoods') { febs.modal.confirm('上架', '确认上架该商品？', function () { upGoods(data.id); }); } if (layEvent === 'delGoods') { febs.modal.confirm('删除', '确认删除该商品？', function () { delGoods(data.id); }); } if (layEvent === 'deliverGoods') { febs.modal.open('发货', 'modules/order/deliverGoods/' + data.id, { btn: ['确认', '取消'], yes: function (index, layero) { $('#user-update').find('#submit').trigger('click'); }, btn2: function () { layer.closeAll(); } }); } }); function downGoods(id) { febs.get(ctx + 'admin/goods/downMallGoods/' + id, null, function () { febs.alert.success('下架成功'); $query.click(); }); } function delGoods(id) { febs.get(ctx + 'admin/goods/delMallGoods/' + id, null, function () { febs.alert.success('删除成功'); $query.click(); }); } function upGoods(id) { febs.get(ctx + 'admin/goods/upMallGoods/' + id, null, function () { febs.alert.success('上架成功'); $query.click(); }); } // 查询按钮 $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}); }); $add.on('click', function () { febs.view.tab.change("/modules/goods/goodsAddNew/"); }); function initTable() { tableIns = febs.table.init({ elem: $view.find('table'), id: 'orderTable', url: ctx + 'admin/order/orderList', cols: [[ {field: 'orderNo', title: '商品名称', minWidth: 150,align:'left'}, // {field: 'accountType', title: '账号类型', // templet: function (d) { // if (d.accountType === 2) { // return '<span style="color:red;">测试账号</span>' // } else if (d.accountType === 1) { // return '<span style="color:green;">正常账号</span>' // }else{ // return '' // } // }, minWidth: 80,align:'center'}, // {field: 'accountStatus', title: '账号状态', // templet: function (d) { // if (d.accountStatus === 1) { // return '<span style="color:green;">正常</span>' // } else if (d.accountStatus === 2) { // return '<span style="color:red;">禁用</span>' // }else{ // return '' // } // }, minWidth: 80,align:'center'}, // {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'}, {title: '操作', templet: function (d) { if (d.status === 2) { return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>' } // else{ // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="upGoods" shiro:hasPermission="user:update">上架</button>' // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="delGoods" shiro:hasPermission="user:update">删除</button>' // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="updateGoods" shiro:hasPermission="user:update">编辑</button>' // // } },minWidth: 300,align:'center'} ]] }); } // 获取查询参数 function getQueryParams() { return { name: $searchForm.find('input[name="name"]').val().trim(), orderNo: $searchForm.find('input[name="orderNo"]').val().trim(), payResult: $searchForm.find("select[name='payResult']").val(), status: $searchForm.find("select[name='status']").val(), }; } }) </script>
