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

Skip to content

L
liquidnet-bus-v1
Commit 86c35fdb authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents b92f3c97 acdbca69
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 72 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/admin/OrderListReq.java
View file @ 86c35fdb
......@@ -23,8 +23,8 @@ public class OrderListReq {
private String payType;
private String paymentType;
private String orderStatus;
private String orderSource;
private String orderType;
private String getTicketType;
private String expressStatus;
private String tiedType;
// private String tiedType;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/docu/db_liquidnet_admin_data.sql
View file @ 86c35fdb
......@@ -74,6 +74,8 @@ INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status,
INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (108, '出票状态', 'zhengzai_ticket_status', '0', 'admin', '2021-06-11 16:03:36', '', null, '订单出票状态');
INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (109, '票种类型', 'zhengzai_ticket_type', '0', 'admin', '2021-06-18 11:12:28', '', null, null);
INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (110, '会员订单状态', 'zhengzai_member_order_status', '0', 'admin', '2021-06-20 17:18:48', '', null, '会员订单状态');
INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (111, '证件类型', 'zhengzai_certificate_type', '0', 'admin', '2021-06-26 14:32:45', '', null, null);
INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark) VALUES (112, '转增状态', 'zhengzai_transfer_status', '0', 'admin', '2021-06-26 16:06:32', '', null, null);
-- sys_dict_data
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (100, 2, '支付宝', 'alipay', 'zhengzai_pay_type', null, null, 'Y', '0', 'admin', '2021-06-07 10:39:11', '', null, '支付宝');
......@@ -116,4 +118,12 @@ INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (138, 3, '已关闭', '2', 'zhengzai_member_order_status', null, null, 'Y', '0', 'admin', '2021-06-20 17:21:41', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (139, 3, '超时付', '3', 'zhengzai_member_order_status', null, null, 'Y', '0', 'admin', '2021-06-20 17:22:04', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (140, 5, '退款中', '4', 'zhengzai_member_order_status', null, null, 'Y', '0', 'admin', '2021-06-20 17:22:28', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (141, 6, '已退款', '5', 'zhengzai_member_order_status', null, null, 'Y', '0', 'admin', '2021-06-20 17:22:45', '', null, null);
\ No newline at end of file
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (141, 6, '已退款', '5', 'zhengzai_member_order_status', null, null, 'Y', '0', 'admin', '2021-06-20 17:22:45', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (142, 1, '大陆身份证', '1', 'zhengzai_certificate_type', null, null, 'Y', '0', 'admin', '2021-06-26 14:36:41', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (143, 2, '港澳通行证', '2', 'zhengzai_certificate_type', null, null, 'Y', '0', 'admin', '2021-06-26 14:37:18', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (144, 3, '台胞证', '3', 'zhengzai_certificate_type', null, null, 'Y', '0', 'admin', '2021-06-26 14:37:35', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (145, 4, '护照', '4', 'zhengzai_certificate_type', null, null, 'Y', '0', 'admin', '2021-06-26 14:37:53', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (146, 5, '军官证', '5', 'zhengzai_certificate_type', null, null, 'Y', '0', 'admin', '2021-06-26 14:38:11', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (147, 1, '未转增', '0', 'zhengzai_transfer_status', '', '', 'Y', '0', 'admin', '2021-06-26 16:06:52', 'admin', '2021-06-26 16:08:02', '');
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (148, 2, '收到他人转增', '1', 'zhengzai_transfer_status', null, null, 'Y', '0', 'admin', '2021-06-26 16:07:27', '', null, null);
INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark) VALUES (149, 3, '已转增给他人', '2', 'zhengzai_transfer_status', null, null, 'Y', '0', 'admin', '2021-06-26 16:07:54', '', null, null);
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ 86c35fdb
......@@ -60,20 +60,20 @@
</form>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:order:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="kylin:order:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:order:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:order:export">
<i class="fa fa-download"></i> 导出
</a>
</div>
<!-- <div class="btn-group-sm" id="toolbar" role="group">-->
<!-- <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:order:add">-->
<!-- <i class="fa fa-plus"></i> 添加-->
<!-- </a>-->
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="kylin:order:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:order:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="kylin:order:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
<!-- </div>-->
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/details.html
View file @ 86c35fdb
......@@ -9,7 +9,7 @@
<form class="form-horizontal m" id="form-tickets-edit" th:object="${orderDetailsVo}">
<!-- <input name="mid" th:field="*{mid}" type="hidden">-->
<div class="form-group">
<label class="col-sm-3 control-label is-required">演出名称2：</label>
<label class="col-sm-3 control-label is-required">演出名称：</label>
<div class="form-control-static" th:text="*{performanceVo.title}"/>
</div>
<div class="form-group">
......@@ -26,26 +26,24 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">适用日期：</label>
<div class="form-control-static" th:text="*{ticketsVo.useStart}">
<input name="payCountdownMinute" th:field="*{ticketsVo.useStart}" class="form-control" type="text" readonly>
</div>
<div class="form-control-static" th:text="*{orderTicketVo.useStart}"/>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">应付价格：</label>
<div class="form-control-static" th:text="*{orderTicketVo.priceTotal}"/>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">优惠价格：</label>
<div class="form-control-static" th:text="*{orderTicketVo.priceTotal}"/>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label is-required">优惠价格：</label>-->
<!-- <div class="form-control-static" th:text="*{orderTicketVo.priceTotal}"/>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label is-required">实付价格：</label>
<div class="form-control-static" th:text="*{orderTicketVo.priceActual}"/>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">快递价格：</label>
<div class="form-control-static" th:text="*{orderTicketVo.priceExpress}"/>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label is-required">快递价格：</label>-->
<!-- <div class="form-control-static" th:text="*{orderTicketVo.priceExpress}"/>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label is-required">退款价格：</label>
<div class="form-control-static" th:text="*{orderTicketVo.priceRefund}"/>
......@@ -56,9 +54,7 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">转增状态：</label>
<div class="form-control-static">
<!-- <input name="priceVoucher" th:field="*{priceVoucher}" class="form-control" type="text" required>-->
</div>
<div class="form-control-static" th:text="*{@dict.getLabel('zhengzai_transfer_status',orderTicketVo.transferStatus)}"/>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">订单号：</label>
......@@ -66,24 +62,24 @@
</div>
<div class="form-group">
<label class="col-sm-3 control-label">生成时间：</label>
<div class="form-control-static">
<div class="input-group date">
<!-- <input name="createdAt" th:value="${#dates.format(orderTicketVo.createdAt, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
<input name="createdAt" th:value="*{orderTicketVo.createdAt}" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
<div class="form-control-static" th:text="*{orderTicketVo.createdAt}">
<!-- <div class="input-group date">-->
<!--&lt;!&ndash; <input name="createdAt" th:value="${#dates.format(orderTicketVo.createdAt, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">&ndash;&gt;-->
<!-- <input name="createdAt" th:value="*{orderTicketVo.createdAt}" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
<!-- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
<!-- </div>-->
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">实际支付方式：</label>
<div class="form-control-static" th:text="*{@dict.getLabel('zhengzai_pay_type',orderTicketVo.payType)}" />
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">微信订单号：</label>
<div class="form-control-static">
<!-- <input name="orderCode" th:field="*{orderCode}" class="form-control" type="text" required>-->
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label is-required">微信订单号：</label>-->
<!-- <div class="form-control-static">-->
<!--&lt;!&ndash; <input name="orderCode" th:field="*{orderCode}" class="form-control" type="text" required>&ndash;&gt;-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label>
<div class="form-control-static" th:text="*{orderTicketVo.timePay}"/>
......@@ -103,14 +99,14 @@
<div class="col-sm-3">
<input th:value="${@dict.getLabel('zhengzai_certificate_type',ticketEntity.enterType)}" class="form-control" type="text" readonly>
</div>
<label class="col-sm-3 control-label">证件号：</label>
<div class="col-sm-3">
<input th:value="${ticketEntity.enterIdCode}" class="form-control" type="text" readonly>
</div>
<label class="col-sm-3 control-label">电话：</label>
<div class="col-sm-3">
<input th:value="${ticketEntity.enterMobile}" class="form-control" type="text" readonly>
</div>
<label class="col-sm-3 control-label">证件号：</label>
<div class="col-sm-3">
<input th:value="${ticketEntity.enterIdCode}" class="form-control" type="text" readonly>
</div>
<label class="col-sm-3 control-label">票务状态：</label>
<div class="col-sm-3">
<input th:value="${@dict.getLabel('zhengzai_payment_type',ticketEntity.isPayment)}" class="form-control" type="text" readonly>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @ 86c35fdb
......@@ -59,7 +59,7 @@
</li>
<li>
<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 th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
......@@ -77,12 +77,12 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>搭售商品：</label>
<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>
</select>
</li>
<!-- <li>-->
<!-- <label>搭售商品：</label>-->
<!-- <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>-->
<!-- </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>
......@@ -92,20 +92,20 @@
</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="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>
......@@ -188,7 +188,7 @@
title: '手机号'
},
{
field: 'orderSource',
field: 'orderType',
title: '客户端'
},
{
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java
View file @ 86c35fdb
......@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
......@@ -106,6 +107,16 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
orderTicketVo.setTicketId(kylinOrderTicketRelations.getTicketId());
orderTicketVo.setStatus(kylinOrderTicketStatus.getStatus());
orderTicketVo.setPayStatus(kylinOrderTicketStatus.getPayStatus());
orderTicketVo.setTransferStatus(kylinOrderTicketStatus.getTransferStatus());
orderTicketVo.setCreatedAt("");
orderTicketVo.setTimePay("");
orderTicketVo.setUseStart("");
if(StringUtils.isNotNull(kylinOrderTickets.getCreatedAt())){
orderTicketVo.setCreatedAt(DateUtil.format(kylinOrderTickets.getCreatedAt(),DateUtil.Formatter.yyyyMMddHHmmss));
}
if(StringUtils.isNotNull(kylinOrderTickets.getTimePay())){
orderTicketVo.setTimePay(kylinOrderTickets.getTimePay());
}
if (null != orderTicketVo) {
// Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket"));
......@@ -125,6 +136,9 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
KylinTickets kylinTickets = kylinTicketsMapper.selectOne(ticketsWrapper);
KylinTicketVo ticketVo = new KylinTicketVo();
BeanUtil.copy(kylinTickets,ticketVo);
if(StringUtils.isNotNull(kylinTickets.getUseStart())){
orderTicketVo.setUseStart(DateUtil.format(kylinTickets.getUseStart(),DateUtil.Formatter.yyyyMMddHHmmss));
}
//获取订单持票实体信息
LambdaQueryWrapper<KylinOrderTicketEntities> ticketsEntitiesWrapper = new LambdaQueryWrapper<>();
......
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderTicketsListDao.java
View file @ 86c35fdb
......@@ -34,5 +34,6 @@ public class OrderTicketsListDao {
String userId;
String userName;
String userMobile;
String orderType;
String orderSource;
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 86c35fdb
......@@ -23,7 +23,7 @@
<result column="user_id" property="userId"/>
<result column="user_name" property="userName"/>
<result column="user_mobile" property="userMobile"/>
<result column="order_source" property="orderSource"/>
<result column="order_type" property="orderType"/>
</resultMap>
<resultMap id="orderPushDamaiDto" type="com.liquidnet.service.kylin.dao.OrderPushDamaiDto">
......@@ -107,7 +107,7 @@
kot.user_id,
kot.user_name,
kot.user_mobile,
kot.order_source
kot.order_type
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_relations kotr on kot.order_tickets_id = kotr.order_id
......@@ -149,6 +149,7 @@
<if test="createdAt != null ">and kot.created_at = #{createdAt}</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="orderType != null and orderType != ''">and kot.order_type = #{orderType}</if>
<if test="sponsor!=null and sponsor!=''">
AND kp.sponsor = #{sponsor}
</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