修改订单详情

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/details.html

@@ -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-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java

@@ -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<>();