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

Skip to content

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

修改订单详情

parent 05735f8b
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 49 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/docu/db_liquidnet_admin_data.sql
View file @ 53502fc2
...@@ -73,6 +73,7 @@ INSERT INTO test_ln_scene.sys_dict_type (dict_id, dict_name, dict_type, status, ...@@ -73,6 +73,7 @@ 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 (107, '支付状态', 'zhengzai_payment_type', '0', 'admin', '2021-06-11 16:01:37', '', 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 (107, '支付状态', 'zhengzai_payment_type', '0', 'admin', '2021-06-11 16:01:37', '', 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 (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 (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 (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, '会员订单状态');
-- sys_dict_data -- 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, '支付宝'); 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, '支付宝');
...@@ -110,3 +111,9 @@ INSERT INTO test_ln_scene.sys_dict_data (dict_code, dict_sort, dict_label, dict_ ...@@ -110,3 +111,9 @@ 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 (133, 2, '已出票', '1', 'zhengzai_ticket_status', null, null, 'Y', '0', 'admin', '2021-06-11 16:07: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 (133, 2, '已出票', '1', 'zhengzai_ticket_status', null, null, 'Y', '0', 'admin', '2021-06-11 16:07: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 (134, 1, '单日票', '1', 'zhengzai_ticket_type', null, null, 'Y', '0', 'admin', '2021-06-18 11:13:08', '', 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 (134, 1, '单日票', '1', 'zhengzai_ticket_type', null, null, 'Y', '0', 'admin', '2021-06-18 11:13:08', '', 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 (135, 2, '通票', '2', 'zhengzai_ticket_type', null, null, 'Y', '0', 'admin', '2021-06-18 11:13:36', '', 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 (135, 2, '通票', '2', 'zhengzai_ticket_type', null, null, 'Y', '0', 'admin', '2021-06-18 11:13:36', '', 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 (136, 1, '未支付', '0', 'zhengzai_member_order_status', null, null, 'Y', '0', 'admin', '2021-06-20 17:19:22', '', 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 (137, 2, '已支付', '1', 'zhengzai_member_order_status', null, null, 'Y', '0', 'admin', '2021-06-20 17:19:37', '', 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 (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
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/details.html
View file @ 53502fc2
...@@ -9,86 +9,64 @@ ...@@ -9,86 +9,64 @@
<form class="form-horizontal m" id="form-tickets-edit" th:object="${orderDetailsVo}"> <form class="form-horizontal m" id="form-tickets-edit" th:object="${orderDetailsVo}">
<!-- <input name="mid" th:field="*{mid}" type="hidden">--> <!-- <input name="mid" th:field="*{mid}" type="hidden">-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">演出名称：</label> <label class="col-sm-3 control-label is-required">演出名称2：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{performanceVo.title}"/>
<input name="performanceTitle" th:field="*{performanceVo.title}" class="form-control" type="text" required>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">票名：</label> <label class="col-sm-3 control-label is-required">票名：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{ticketsVo.title}"/>
<input name="performanceTitle" th:field="*{ticketsVo.title}" class="form-control" type="text" required>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">单价：</label> <label class="col-sm-3 control-label is-required">单价：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{orderTicketVo.price}"/>
<input name="price" th:field="*{orderTicketVo.price}" class="form-control" type="text" required>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">数量：</label> <label class="col-sm-3 control-label is-required">数量：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{orderTicketVo.number}"/>
<input name="number" th:field="*{orderTicketVo.number}" class="form-control" type="text" required>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">适用日期：</label> <label class="col-sm-3 control-label is-required">适用日期：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{ticketsVo.useStart}">
<input name="payCountdownMinute" th:field="*{ticketsVo.useStart}" class="form-control" type="text" required> <input name="payCountdownMinute" th:field="*{ticketsVo.useStart}" class="form-control" type="text" readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">应付价格：</label> <label class="col-sm-3 control-label is-required">应付价格：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{orderTicketVo.priceTotal}"/>
<input name="priceTotal" th:field="*{orderTicketVo.priceTotal}" class="form-control" type="text" required>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">优惠价格：</label> <label class="col-sm-3 control-label is-required">优惠价格：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{orderTicketVo.priceTotal}"/>
<input name="priceVoucher" th:field="*{orderTicketVo.priceVoucher}" class="form-control" type="text" required>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">实付价格：</label> <label class="col-sm-3 control-label is-required">实付价格：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{orderTicketVo.priceActual}"/>
<input name="priceActual" th:field="*{orderTicketVo.priceActual}" class="form-control" type="text" required>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">快递价格：</label> <label class="col-sm-3 control-label is-required">快递价格：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{orderTicketVo.priceExpress}"/>
<input name="priceExpress" th:field="*{orderTicketVo.priceExpress}" class="form-control" type="text" required>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">退款价格：</label> <label class="col-sm-3 control-label is-required">退款价格：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{orderTicketVo.priceRefund}"/>
<input name="priceRefund" th:field="*{orderTicketVo.priceRefund}" class="form-control" type="text" required>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">订单状态：</label> <label class="col-sm-3 control-label is-required">订单状态：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{@dict.getLabel('zhengzai_order_status',orderTicketVo.status)}"/>
<!-- <input name="priceVoucher" th:field="*{orderTicketVo.}" class="form-control" type="text" required>-->
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">转增状态：</label> <label class="col-sm-3 control-label is-required">转增状态：</label>
<div class="col-sm-8"> <div class="form-control-static">
<!-- <input name="priceVoucher" th:field="*{priceVoucher}" class="form-control" type="text" required>--> <!-- <input name="priceVoucher" th:field="*{priceVoucher}" class="form-control" type="text" required>-->
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">订单号：</label> <label class="col-sm-3 control-label is-required">订单号：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{orderTicketVo.orderCode}" />
<input name="orderCode" th:field="*{orderTicketVo.orderCode}" class="form-control" type="text" required>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">生成时间：</label> <label class="col-sm-3 control-label">生成时间：</label>
<div class="col-sm-8"> <div class="form-control-static">
<div class="input-group date"> <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="${#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"> <input name="createdAt" th:value="*{orderTicketVo.createdAt}" class="form-control" placeholder="yyyy-MM-dd" type="text">
...@@ -98,34 +76,33 @@ ...@@ -98,34 +76,33 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">实际支付方式：</label> <label class="col-sm-3 control-label">实际支付方式：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{@dict.getLabel('zhengzai_pay_type',orderTicketVo.payType)}" />
<select name="paymentType" th:with="type=${@dict.getType('zhengzai_pay_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{orderTicketVo.paymentType}" readonly></option>
</select>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">微信订单号：</label> <label class="col-sm-3 control-label is-required">微信订单号：</label>
<div class="col-sm-8"> <div class="form-control-static">
<!-- <input name="orderCode" th:field="*{orderCode}" class="form-control" type="text" required>--> <!-- <input name="orderCode" th:field="*{orderCode}" class="form-control" type="text" required>-->
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">支付时间：</label> <label class="col-sm-3 control-label">支付时间：</label>
<div class="col-sm-8"> <div class="form-control-static" th:text="*{orderTicketVo.timePay}"/>
<input name="timePay" th:field="*{orderTicketVo.timePay}" class="form-control" type="text">
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">取票方式：</label> <label class="col-sm-3 control-label is-required">取票方式：</label>
<div class="col-sm-8" th:text="${@dict.getLabel('zhengzai_get_ticket_type',orderDetailsVo.orderTicketVo.getTicketType)}"> <div class="form-control-static" th:text="${@dict.getLabel('zhengzai_get_ticket_type',orderDetailsVo.orderTicketVo.getTicketType)}">
</div> </div>
</div> </div>
<div th:each="ticketEntity,ticketEntityStat : *{orderTicketEntitiesVo}" class="select-list" > <div th:each="ticketEntity,ticketEntityStat : *{orderTicketEntitiesVo}" class="form-group select-list" >
<div class="hr-line-dashed"></div>
<label class="col-sm-3 control-label is-required">取票人[[${ticketEntityStat.count}]]：</label> <label class="col-sm-3 control-label is-required">取票人[[${ticketEntityStat.count}]]：</label>
<div class="col-sm-3"> <div class="col-sm-3">
<input th:value="${ticketEntity.enterName}" class="form-control" type="text" readonly> <input th:value="${ticketEntity.enterName}" class="form-control" type="text" readonly>
</div> </div>
<label class="col-sm-3 control-label">证件类型：</label>
<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> <label class="col-sm-3 control-label">证件号：</label>
<div class="col-sm-3"> <div class="col-sm-3">
<input th:value="${ticketEntity.enterIdCode}" class="form-control" type="text" readonly> <input th:value="${ticketEntity.enterIdCode}" class="form-control" type="text" readonly>
......
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 @ 53502fc2
...@@ -15,6 +15,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo; ...@@ -15,6 +15,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.entity.*; import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*; import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.IKylinOrderTicketStatusService;
import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService; import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -46,6 +47,9 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -46,6 +47,9 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
@Autowired @Autowired
private KylinOrderTicketRelationsMapper kylinOrderTicketRelationsMapper; private KylinOrderTicketRelationsMapper kylinOrderTicketRelationsMapper;
@Autowired
private KylinOrderTicketStatusMapper kylinOrderTicketStatusMapper;
@Autowired @Autowired
private KylinPerformancesMapper kylinPerformancesMapper; private KylinPerformancesMapper kylinPerformancesMapper;
...@@ -91,6 +95,18 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -91,6 +95,18 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
BeanUtil.copy(kylinOrderTickets,orderTicketVo); BeanUtil.copy(kylinOrderTickets,orderTicketVo);
orderTicketVo.setPerformanceId(kylinOrderTicketRelations.getPerformanceId()); orderTicketVo.setPerformanceId(kylinOrderTicketRelations.getPerformanceId());
orderTicketVo.setTicketId(kylinOrderTicketRelations.getTicketId()); orderTicketVo.setTicketId(kylinOrderTicketRelations.getTicketId());
//获取订单状态
LambdaQueryWrapper<KylinOrderTicketStatus> orderStatusWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotNull(orderId)) {
orderStatusWrapper.eq(KylinOrderTicketStatus::getOrderId,orderId);
}
KylinOrderTicketStatus kylinOrderTicketStatus = kylinOrderTicketStatusMapper.selectOne(orderStatusWrapper);
BeanUtil.copy(kylinOrderTickets,orderTicketVo);
orderTicketVo.setPerformanceId(kylinOrderTicketRelations.getPerformanceId());
orderTicketVo.setTicketId(kylinOrderTicketRelations.getTicketId());
orderTicketVo.setStatus(kylinOrderTicketStatus.getStatus());
orderTicketVo.setPayStatus(kylinOrderTicketStatus.getPayStatus());
if (null != orderTicketVo) { if (null != orderTicketVo) {
// Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket")); // Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket"));
//获取演出信息 //获取演出信息
......
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