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

Skip to content

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

修改订单详情

parent 8fbfadac
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 40 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/admin/OrderListReq.java
View file @ fffbce9c
...@@ -23,8 +23,8 @@ public class OrderListReq { ...@@ -23,8 +23,8 @@ public class OrderListReq {
private String payType; private String payType;
private String paymentType; private String paymentType;
private String orderStatus; private String orderStatus;
private String orderSource; private String orderType;
private String getTicketType; private String getTicketType;
private String expressStatus; private String expressStatus;
private String tiedType; // private String tiedType;
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ fffbce9c
...@@ -60,20 +60,20 @@ ...@@ -60,20 +60,20 @@
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <!-- <div class="btn-group-sm" id="toolbar" role="group">-->
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:order:add"> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:order:add">-->
<i class="fa fa-plus"></i> 添加 <!-- <i class="fa fa-plus"></i> 添加-->
</a> <!-- </a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="kylin:order:edit"> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="kylin:order:edit">-->
<i class="fa fa-edit"></i> 修改 <!-- <i class="fa fa-edit"></i> 修改-->
</a> <!-- </a>-->
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:order:remove"> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:order:remove">-->
<i class="fa fa-remove"></i> 删除 <!-- <i class="fa fa-remove"></i> 删除-->
</a> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:order:export"> <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:order:export">-->
<i class="fa fa-download"></i> 导出 <!-- <i class="fa fa-download"></i> 导出-->
</a> <!-- </a>-->
</div> <!-- </div>-->
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @ fffbce9c
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</li> </li>
<li> <li>
<label>客户端：</label> <label>客户端：</label>
<select name="orderSource" th:with="type=${@dict.getType('zhengzai_order_source')}"> <select name="orderType" th:with="type=${@dict.getType('zhengzai_order_source')}">
<option value="">所有</option> <option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
...@@ -77,12 +77,12 @@ ...@@ -77,12 +77,12 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li> <!-- <li>-->
<label>搭售商品：</label> <!-- <label>搭售商品：</label>-->
<select name="tiedType" th:with="type=${@dict.getType('zhengzai_tied_type')}"> <!-- <select name="tiedType" th:with="type=${@dict.getType('zhengzai_tied_type')}">-->
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
</select> <!-- </select>-->
</li> <!-- </li>-->
<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-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> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
...@@ -92,20 +92,20 @@ ...@@ -92,20 +92,20 @@
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group"> <!-- <div class="btn-group-sm" id="toolbar" role="group">-->
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:tickets:add"> <!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:tickets:add">-->
<i class="fa fa-plus"></i> 添加 <!-- <i class="fa fa-plus"></i> 添加-->
</a> <!-- </a>-->
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="kylin:tickets:edit"> <!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="kylin:tickets:edit">-->
<i class="fa fa-edit"></i> 修改 <!-- <i class="fa fa-edit"></i> 修改-->
</a> <!-- </a>-->
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:tickets:remove"> <!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:tickets:remove">-->
<i class="fa fa-remove"></i> 删除 <!-- <i class="fa fa-remove"></i> 删除-->
</a> <!-- </a>-->
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:tickets:export"> <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:tickets:export">-->
<i class="fa fa-download"></i> 导出 <!-- <i class="fa fa-download"></i> 导出-->
</a> <!-- </a>-->
</div> <!-- </div>-->
<div class="col-sm-12 select-table table-bordered"> <div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
title: '手机号' title: '手机号'
}, },
{ {
field: 'orderSource', field: 'orderType',
title: '客户端' title: '客户端'
}, },
{ {
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderTicketsListDao.java
View file @ fffbce9c
...@@ -34,5 +34,6 @@ public class OrderTicketsListDao { ...@@ -34,5 +34,6 @@ public class OrderTicketsListDao {
String userId; String userId;
String userName; String userName;
String userMobile; String userMobile;
String orderType;
String orderSource; String orderSource;
} }
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ fffbce9c
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<result column="user_id" property="userId"/> <result column="user_id" property="userId"/>
<result column="user_name" property="userName"/> <result column="user_name" property="userName"/>
<result column="user_mobile" property="userMobile"/> <result column="user_mobile" property="userMobile"/>
<result column="order_source" property="orderSource"/> <result column="order_type" property="orderType"/>
</resultMap> </resultMap>
<resultMap id="orderPushDamaiDto" type="com.liquidnet.service.kylin.dao.OrderPushDamaiDto"> <resultMap id="orderPushDamaiDto" type="com.liquidnet.service.kylin.dao.OrderPushDamaiDto">
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
kot.user_id, kot.user_id,
kot.user_name, kot.user_name,
kot.user_mobile, kot.user_mobile,
kot.order_source kot.order_type
FROM kylin_order_tickets kot FROM kylin_order_tickets kot
inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id inner join kylin_order_ticket_status kots on kot.order_tickets_id = kots.order_id
inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id inner join kylin_order_ticket_relations kotr on kot.order_tickets_id = kotr.order_id
...@@ -149,6 +149,7 @@ ...@@ -149,6 +149,7 @@
<if test="createdAt != null ">and kot.created_at = #{createdAt}</if> <if test="createdAt != null ">and kot.created_at = #{createdAt}</if>
<if test="updatedAt != null ">and kot.updated_at = #{updatedAt}</if> <if test="updatedAt != null ">and kot.updated_at = #{updatedAt}</if>
<if test="orderSource != null and orderSource != ''">and kot.order_source = #{orderSource}</if> <if test="orderSource != null and orderSource != ''">and kot.order_source = #{orderSource}</if>
<if test="orderType != null and orderType != ''">and kot.order_type = #{orderType}</if>
<if test="sponsor!=null and sponsor!=''"> <if test="sponsor!=null and sponsor!=''">
AND kp.sponsor = #{sponsor} AND kp.sponsor = #{sponsor}
</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