记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 6bd43a8b authored by anjiabin's avatar anjiabin
Browse files
Options

提交订单列表

parent 957f5301
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 28 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderTicketsController.java
View file @ 6bd43a8b
...@@ -8,10 +8,8 @@ import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService; ...@@ -8,10 +8,8 @@ import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List; import java.util.List;
...@@ -49,4 +47,14 @@ public class KylinOrderTicketsController extends BaseController ...@@ -49,4 +47,14 @@ public class KylinOrderTicketsController extends BaseController
List<OrderTicketsListDao> list = iKylinOrderTicketsAdminService.orderList(orderListReq); List<OrderTicketsListDao> list = iKylinOrderTicketsAdminService.orderList(orderListReq);
return getDataTable(list); return getDataTable(list);
} }
/**
* 订单详情
*/
@GetMapping("/orderList/detail/{orderId}")
public String addPerformance(@PathVariable("orderId") String orderId, ModelMap mmap) {
mmap.put("roadShowId", orderId);
return prefix + "/orderList/details";
}
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/tickets/tickets.html 0 → 100644
View file @ 6bd43a8b
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('订单列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>订单号：</label>
<input type="text" name="orderCode"/>
</li>
<li>
<label>演出名称：</label>
<input type="text" name="performanceTitle"/>
</li>
<li>
<label>电话：</label>
<input type="text" name="userMobile"/>
</li>
<li class="select-time">
<label>支付时间： </label>
<input type="text" class="time-input" id="timePayStart" placeholder="开始日期" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="time-input" id="timePayEnd" placeholder="结束日期" name="params[endTime]"/>
</li>
<li>
<label>第三方：</label>
<select name="orderType">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<label>支付方式：</label>
<select name="orderType">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<label>订单状态：</label>
<select name="orderType">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<label>客户端：</label>
<select name="orderType">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<label>取票方式：</label>
<select name="orderType">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<label>快递状态：</label>
<select name="orderType">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<label>搭售商品：</label>
<select name="orderType">
<option value="">所有</option>
<option value="-1">代码生成请选择字典属性</option>
</select>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:tickets:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="kylin:tickets:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:tickets:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:tickets:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('kylin:tickets:edit')}]];
var removeFlag = [[${@permission.hasPermi('kylin:tickets:remove')}]];
var prefix = ctx + "kylin/tickets";
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
modalName: "订单",
columns: [{
checkbox: true
},
{
field: 'userId',
title: '第三方'
},
{
field: 'orderCode',
title: '订单号'
},
{
field: 'performanceTitle',
title: '演出名称'
},
{
field: 'getTicketType',
title: '订单状态'
},
{
field: 'getTicketType',
title: '取票方式'
},
{
field: 'paymentType',
title: '支付方式'
},
{
field: 'userId',
title: '搭售'
},
{
field: 'userName',
title: '总价格'
},
{
field: 'number',
title: '购票量'
},
{
field: 'userId',
title: '用户ID'
},
{
field: 'userMobile',
title: '账户名'
},
{
field: 'userMobile',
title: '手机号'
},
{
field: 'qrCode',
title: '客户端'
},
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.mid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.mid + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
}]
};
$.table.init(options);
});
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 6bd43a8b
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</where> </where>
LIMIT ${limitNum} LIMIT ${limitNum}
</select> </select>
<select id="orderList" resultMap="PerformanceRecommendAdminDaoResult"> <select id="orderList" resultMap="orderTicketsListDaoResult">
SELECT SELECT
kot.order_tickets_id, kot.order_tickets_id,
kp.sponsor, kp.sponsor,
...@@ -124,29 +124,6 @@ ...@@ -124,29 +124,6 @@
<if test="updatedAt != null "> and updated_at = #{updatedAt}</if> <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
<if test="orderSourece != null and orderSourece != ''"> and order_sourece = #{orderSourece}</if> <if test="orderSourece != null and orderSourece != ''"> and order_sourece = #{orderSourece}</if>
</where> </where>
<where>
<if test="title!=''">
AND title LIKE concat('%', #{title}, '%')
</if>
<if test="cityName!=''">
AND city_name LIKE concat('%', #{cityName}, '%')
</if>
<if test="status!='-2'">
AND ps.STATUS = #{status}
</if>
<if test="status=='-2'">
AND ps.STATUS >= 3 or ps.STATUS = 1
</if>
<if test="auditStatus!='-2'">
AND ps.audit_status = #{auditStatus}
</if>
<!-- <if test="auditStatus=='-2'">-->
<!-- AND (ps.audit_status = 0 or ps.audit_status = 1 or ps.audit_status = 2)-->
<!-- </if>-->
<if test="stopSellDay!=-2">
AND p.time_end BETWEEN #{stopSellTime} AND NOW()
</if>
</where>
<if test="orderItem!=''"> <if test="orderItem!=''">
ORDER BY ${orderItem} ${orderSc} ORDER BY ${orderItem} ${orderSc}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment