From 1af6c4c935d3ee880c61a5ab067a9b4196d2a796 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 Jul 2023 15:48:00 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/java/cc/mrbird/febs/mall/dto/AdminRollHouseCheckDto.java | 16 ++
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 26 +++
src/main/resources/templates/febs/views/modules/mallMember/rollHouseList.html | 200 ++++++++++++++++++++++++++++
src/main/resources/templates/febs/views/modules/mallMember/rollHouseCheck.html | 82 +++++++++++
src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java | 2
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 18 ++
src/main/java/cc/mrbird/febs/mall/entity/MallMemberHouse.java | 7 +
src/main/resources/mapper/modules/MallMemberMapper.xml | 25 +++
src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java | 4
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 25 +++
10 files changed, 405 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index f26cca9..8e58190 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -553,4 +553,22 @@
return mallMemberService.agentVerifyUpdate(adminAgentVerifyVo);
}
+ /**
+ * 民宿核销列表
+ */
+ @GetMapping("rollHouseList")
+ public FebsResponse rollHouseList(MallMemberHouse mallMemberHouse, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getMallRollHouseList(mallMemberHouse, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 民宿核销列表-核销
+ */
+ @PostMapping("rollHouseCheck")
+ @ControllerEndpoint(operation = "民宿核销列表-核销", exceptionMessage = "操作失败")
+ public FebsResponse rollHouseCheck(@Valid AdminRollHouseCheckDto rollHouseCheckDto) {
+ return mallMemberService.rollHouseCheck(rollHouseCheckDto);
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index 25c2a31..8ff5849 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.MallAgentRecordMapper;
+import cc.mrbird.febs.mall.mapper.MallMemberHouseMapper;
import cc.mrbird.febs.mall.mapper.MallSalesmanMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
@@ -25,6 +26,7 @@
private final MallSalesmanMapper mallSalesmanMapper;
private final MallAgentRecordMapper mallAgentRecordMapper;
+ private final MallMemberHouseMapper mallMemberHouseMapper;
public static long idFromMoneyFlow;
@@ -364,5 +366,29 @@
return FebsUtil.view("modules/mallMember/agentVerify");
}
+ /**
+ * 民宿核销列表
+ * @return
+ */
+ @GetMapping("rollHouseList")
+ @RequiresPermissions("rollHouseList:view")
+ public String rollHouseList() {
+ return FebsUtil.view("modules/mallMember/rollHouseList");
+ }
+
+ /**
+ * 民宿核销列表-核销
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("rollHouseCheck/{id}")
+ @RequiresPermissions("rollHouseCheck:update")
+ public String rollHouseCheck(@PathVariable long id, Model model) {
+ MallMemberHouse mallMemberHouse = mallMemberHouseMapper.selectById(id);
+ model.addAttribute("mallMemberHouse", mallMemberHouse);
+ return FebsUtil.view("modules/mallMember/rollHouseCheck");
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AdminRollHouseCheckDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AdminRollHouseCheckDto.java
new file mode 100644
index 0000000..4a38ee7
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AdminRollHouseCheckDto.java
@@ -0,0 +1,16 @@
+package cc.mrbird.febs.mall.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(value = "AdminRollHouseCheckDto", description = "参数接收类")
+public class AdminRollHouseCheckDto {
+
+ private Long id;
+ @NotNull(message = "参数不能为空")
+ private String takeCode;
+
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberHouse.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberHouse.java
index be8507b..d3e300d 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberHouse.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberHouse.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.mall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -35,4 +36,10 @@
private String houseAddress;
private String housePic;
+
+ @TableField(exist = false)
+ private String name;
+ @TableField(exist = false)
+ private String phone;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
index 993ae13..2d7e61d 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
@@ -92,4 +92,6 @@
IPage<MallMemberClass> findMallMemberClassInPage(Page<MallMemberClass> page, @Param("record")MallMemberClass mallMemberClass);
IPage<MallMemberHouse> findMallMemberHouseInPage(Page<MallMemberHouse> page, @Param("record")MallMemberHouse mallMemberHouse);
+
+ IPage<MallMemberHouse> getMallRollHouseListInPage(Page<MallMemberHouse> page, @Param("record")MallMemberHouse mallMemberHouse);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
index 86c2992..18a1c54 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
@@ -126,4 +126,8 @@
List<AdminAgentLevelOptionTreeVo> agentLevelOption();
FebsResponse agentVerifyUpdate(AdminAgentVerifyVo adminAgentVerifyVo);
+
+ IPage<MallMemberHouse> getMallRollHouseList(MallMemberHouse mallMemberHouse, QueryRequest request);
+
+ FebsResponse rollHouseCheck(AdminRollHouseCheckDto rollHouseCheckDto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index 5f92116..d4aceb4 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -70,6 +70,8 @@
private final MallAgentRecordMapper mallAgentRecordMapper;
private final MallSalesmanMapper mallSalesmanMapper;
+ private final MallMemberHouseMapper mallMemberHouseMapper;
+ private final MallOrderInfoMapper mallOrderInfoMapper;
@Override
public IPage<MallMember> getMallMemberList(MallMember mallMember, QueryRequest request) {
@@ -311,6 +313,29 @@
}
@Override
+ public IPage<MallMemberHouse> getMallRollHouseList(MallMemberHouse mallMemberHouse, QueryRequest request) {
+ Page<MallMemberHouse> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<MallMemberHouse> mallMemberHouseIPage = this.baseMapper.getMallRollHouseListInPage(page, mallMemberHouse);
+ return mallMemberHouseIPage;
+ }
+
+ @Override
+ public FebsResponse rollHouseCheck(AdminRollHouseCheckDto rollHouseCheckDto) {
+ MallMemberHouse mallMemberHouse = mallMemberHouseMapper.selectById(rollHouseCheckDto.getId());
+ String takeCode = rollHouseCheckDto.getTakeCode();
+
+ Long orderId = mallMemberHouse.getOrderId();
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
+ String takeCode1 = mallOrderInfo.getTakeCode();
+ if(!takeCode1.equals(takeCode)){
+ throw new FebsException("核销码不正确");
+ }
+ mallMemberHouse.setState(2);
+ mallMemberHouseMapper.updateById(mallMemberHouse);
+ return new FebsResponse().success().message("操作成功");
+ }
+
+ @Override
public IPage<AdminAgentMemberVo> agentChild(QueryRequest request, MallMember mallMember) {
Long memberId = mallMember.getId();
mallMember = mallMemberMapper.selectById(memberId);
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 93b9456..d859b84 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -431,4 +431,29 @@
</if>
order by id desc
</select>
+
+ <select id="getMallRollHouseListInPage" resultType="cc.mrbird.febs.mall.entity.MallMemberHouse">
+ select
+ a.*,
+ b.name,
+ b.phone
+ from mall_member_house a
+ left join mall_member b on a.member_id = b.id
+ <where>
+ <if test="record.state != null and record.state != ''">
+ and a.state = #{record.state}
+ </if>
+ <if test="record.orderNo != null and record.orderNo != ''">
+ and a.order_no = #{record.orderNo}
+ </if>
+ <if test="record.name != null and record.name != ''">
+ and b.name = #{record.name}
+ </if>
+ <if test="record.phone != null and record.phone != ''">
+ and b.phone = #{record.phone}
+ </if>
+
+ </where>
+ order by id desc
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/rollHouseCheck.html b/src/main/resources/templates/febs/views/modules/mallMember/rollHouseCheck.html
new file mode 100644
index 0000000..d5164a6
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/mallMember/rollHouseCheck.html
@@ -0,0 +1,82 @@
+<style>
+ #houseCheck-update {
+ padding: 20px 25px 25px 0;
+ }
+
+ #houseCheck-update .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #houseCheck-update #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #houseCheck-update .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+ #houseCheck-update img{
+ max-width:100px
+ }
+
+</style>
+<div class="layui-fluid" id="houseCheck-update">
+ <form class="layui-form" action="" lay-filter="houseCheck-update-form">
+ <div class="layui-form-item febs-hide">
+ <label class="layui-form-label febs-form-item-require">id：</label>
+ <div class="layui-input-block">
+ <input type="text" name="id">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">核销码：</label>
+ <div class="layui-input-block">
+ <input type="number" name="takeCode" lay-verify="required" autocomplete="off" class="layui-input">
+ <div class="layui-word-aux">请输入我的民宿中的验证码。</div>
+ </div>
+ </div>
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="houseCheck-update-form-submit" id="submit"></button>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'laydate'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ formSelects = layui.formSelects,
+ form = layui.form,
+ laydate = layui.laydate,
+ mallMemberHouse = [[${mallMemberHouse}]],
+ type = [[${type}]],
+ $view = $('#houseCheck-update'),
+ validate = layui.validate;
+
+ form.render();
+ laydate.render({
+ elem: '#febs-form-group-date'
+ });
+
+ formSelects.render();
+
+
+ initUserValue();
+
+ function initUserValue() {
+ form.val("houseCheck-update-form", {
+ "id": mallMemberHouse.id,
+ });
+ }
+
+ form.on('submit(houseCheck-update-form-submit)', function (data) {
+ febs.post(ctx + 'admin/mallMember/rollHouseCheck', data.field, function () {
+ layer.closeAll();
+ febs.alert.success('操作成功');
+ $('#febs-roll-house-list').find('#query').click();
+ });
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/rollHouseList.html b/src/main/resources/templates/febs/views/modules/mallMember/rollHouseList.html
new file mode 100644
index 0000000..4dc56c1
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/mallMember/rollHouseList.html
@@ -0,0 +1,200 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-roll-house-list" 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-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="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">
+ <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="phone" 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="1">待使用</option>
+ <option value="2">已使用</option>
+ <option value="3">已过期</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>
+ </div>
+ </form>
+ <table lay-filter="rollHouseTable" lay-data="{id: 'rollHouseTable'}"></table>
+ <style type="text/css">
+ ::-webkit-scrollbar {
+ height: 20px !important;
+ background-color: #f4f4f4;
+ }
+ </style>
+ </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>
+<script type="text/html" id="stateNormalFormat">
+ {{#
+ var state = {
+ 1: {title: '待使用', color: 'green'},
+ 2: {title: '已使用', color: 'blue'},
+ 3: {title: '已过期', color: 'red'},
+ }[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-roll-house-list'),
+ $query = $view.find('#query'),
+ $reset = $view.find('#reset'),
+ $searchForm = $view.find('form'),
+ sortObject = {field: 'phone', type: null},
+ tableIns;
+
+ form.render();
+
+ // 表格初始化
+ initTable();
+
+ // 初始化表格操作栏各个按钮功能
+ table.on('tool(rollHouseTable)', function (obj) {
+ var data = obj.data,
+ layEvent = obj.event;
+
+ if (layEvent === 'seeImgThumb') {
+ var t = $view.find('#seeImgThumb'+data.id+'');
+ //页面层
+ layer.open({
+ type: 1,
+ title: "图片",
+ skin: 'layui-layer-rim', //加上边框
+ area: ['80%', '80%'], //宽高
+ shadeClose: true, //开启遮罩关闭
+ end: function (index, layero) {
+ return false;
+ },
+ content: '<div style="text-align:center"><img src="' + $(t).attr('src') + '" /></div>'
+ });
+ }
+
+ if (layEvent === 'houseCheck') {
+ houseCheck("民宿核销", data.id);
+ }
+ });
+ // 查询按钮
+ $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 houseCheck(text, id) {
+ febs.modal.open('text', 'modules/mallMember/rollHouseCheck/'+ id, {
+ btn: ['确认', '取消'],
+ yes: function (index, layero) {
+ $('#houseCheck-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+
+ // 获取查询参数
+ function getQueryParams() {
+ return {
+ orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
+ name: $searchForm.find('input[name="name"]').val().trim(),
+ phone: $searchForm.find('input[name="phone"]').val().trim(),
+ state: $searchForm.find("select[name='state']").val(),
+ };
+ }
+
+ function initTable() {
+ tableIns = febs.table.init({
+ elem: $view.find('table'),
+ id: 'rollHouseTable',
+ url: ctx + 'admin/mallMember/rollHouseList',
+ defaultToolbar:[],
+ cols: [[
+ {field: 'orderNo', title: '订单编号', minWidth: 220,align:'center'},
+ {field: 'name', title: '用户昵称', minWidth: 100,align:'center'},
+ {field: 'phone', title: '手机号码', minWidth: 150,align:'center'},
+ {field: 'housePic', title: '图片',
+ templet: function (d) {
+ return '<a lay-event="seeImgThumb"><img id="seeImgThumb'+d.id+'" src="'+d.housePic+'" alt=""></a>';
+ }, minWidth: 150,align:'center'},
+ {field: 'createTime', title: '下单时间', minWidth: 80,align:'center'},
+ {field: 'updateTime', title: '入住时间', minWidth: 80,align:'center'},
+ {field: 'unuseTime', title: '过期时间', minWidth: 80,align:'center'},
+ {title: '状态', minWidth: 100,templet: '#stateNormalFormat',align:'center'},
+ {field: 'houseName', title: '名称', minWidth: 100,align:'center'},
+ {field: 'houseAddress', title: '地址', minWidth: 100,align:'center'},
+ {title: '操作',
+ templet: function (d) {
+ if (d.state === 1) {
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="houseCheck" shiro:hasPermission="rollHouseCheck:update">核销</button>';
+ }else{
+ return ''
+ }
+ },minWidth: 200,align:'center'}
+ ]]
+ });
+ }
+
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.1