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

Skip to content

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

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

# Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java
parents 3facbe7b 61d0b9f3
Hide whitespace changes
Inline Side-by-side
Showing with 342 additions and 153 deletions
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/OrderDetailsAdminVo.java 0 → 100644
View file @ ade2dce6
package com.liquidnet.service.kylin.dto.vo.admin;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import lombok.Data;
import java.util.List;
@Data
public class OrderDetailsAdminVo {
private KylinOrderTicketVo orderTicketVo;
private List<KylinOrderTicketEntitiesVo> orderTicketEntitiesVo;
private KylinPerformanceVo performanceVo;
private KylinTicketVo ticketsVo;
private String express_number;
private String express_company;
private Integer kuaidi_status;
private Long restTime;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinOrderTicketsAdminService.java
View file @ ade2dce6
...@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.service.admin; ...@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.service.admin;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.dao.OrderTicketsListDao; import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
import com.liquidnet.service.kylin.dto.param.admin.OrderListReq; import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo; import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
import com.liquidnet.service.kylin.entity.KylinOrderTickets; import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import java.util.List; import java.util.List;
...@@ -22,5 +22,5 @@ public interface IKylinOrderTicketsAdminService extends IService<KylinOrderTicke ...@@ -22,5 +22,5 @@ public interface IKylinOrderTicketsAdminService extends IService<KylinOrderTicke
List<OrderTicketsListDao> orderList(OrderListReq orderListReq); List<OrderTicketsListDao> orderList(OrderListReq orderListReq);
//订单详情 //订单详情
OrderDetailsVo orderDetails(String orderId); OrderDetailsAdminVo orderDetails(String orderId);
} }
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java
View file @ ade2dce6
package com.liquidnet.client.admin.web.controller.zhengzai.kylin; package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
import cn.hutool.core.text.UnicodeUtil;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.common.core.controller.BaseController; import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult; import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderRefundsServiceImpl; import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderRefundsServiceImpl;
import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderTicketsAdminServiceImpl; import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinOrderTicketsAdminServiceImpl;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dao.OrderRefundDao; import com.liquidnet.service.kylin.dao.OrderRefundDao;
...@@ -22,7 +20,7 @@ import org.springframework.stereotype.Controller; ...@@ -22,7 +20,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.Map; import java.util.List;
/** /**
* <p> * <p>
...@@ -82,7 +80,7 @@ public class KylinOrderRefundAdminController extends BaseController { ...@@ -82,7 +80,7 @@ public class KylinOrderRefundAdminController extends BaseController {
@PostMapping("applyOrder") @PostMapping("applyOrder")
@ResponseBody @ResponseBody
public OrderDetailsVo applyOrder(RefundApplyParam refundApplyParam) { public OrderDetailsVo applyOrder(RefundApplyParam refundApplyParam) {
OrderDetailsVo orderInfo = kylinOrderRefundsServiceImpl.orderDetails(refundApplyParam.getOrderCode()); OrderDetailsVo orderInfo = kylinOrderTicketsAdminServiceImpl.orderDetails(refundApplyParam.getOrderTicketsId());
return orderInfo; return orderInfo;
} }
...@@ -184,14 +182,7 @@ public class KylinOrderRefundAdminController extends BaseController { ...@@ -184,14 +182,7 @@ public class KylinOrderRefundAdminController extends BaseController {
return error(res.getMessage()); return error(res.getMessage());
} }
} catch (Exception e) { } catch (Exception e) {
String message = e.getMessage(); return error(e.getMessage());
String[] msg = e.getMessage().split(" ");
if (msg.length>0 && null != msg[3]) {
String msgStr = UnicodeUtil.toString(msg[3]);
Map msgMap = JsonUtils.fromJson(msgStr.replace("[", "").replace("]", ""), Map.class);
message = msgMap.get("message").toString();
}
return error(message);
} }
} }
......
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 @ ade2dce6
...@@ -4,7 +4,7 @@ import com.liquidnet.client.admin.common.core.controller.BaseController; ...@@ -4,7 +4,7 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.page.TableDataInfo; import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.service.kylin.dao.OrderTicketsListDao; import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
import com.liquidnet.service.kylin.dto.param.admin.OrderListReq; import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo; import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService; 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;
...@@ -55,7 +55,7 @@ public class KylinOrderTicketsController extends BaseController ...@@ -55,7 +55,7 @@ public class KylinOrderTicketsController extends BaseController
@RequiresPermissions("kylin:order:orderlist:detail") @RequiresPermissions("kylin:order:orderlist:detail")
@GetMapping("/orderList/detail/{orderId}") @GetMapping("/orderList/detail/{orderId}")
public String addPerformance(@PathVariable("orderId") String orderId, ModelMap mmap) { public String addPerformance(@PathVariable("orderId") String orderId, ModelMap mmap) {
OrderDetailsVo orderDetailsVo = iKylinOrderTicketsAdminService.orderDetails(orderId); OrderDetailsAdminVo orderDetailsVo = iKylinOrderTicketsAdminService.orderDetails(orderId);
mmap.put("orderDetailsVo", orderDetailsVo); mmap.put("orderDetailsVo", orderDetailsVo);
return prefix + "/orderList/details"; return prefix + "/orderList/details";
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/monitor/operlog/detail.html
View file @ ade2dce6
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">操作模块：</label> <label class="col-sm-2 control-label">操作模块：</label>
<div class="form-control-static" th:text="${operLog.title} + ' / ' + ${@dict.getLabel('sys_oper_type',operLog.businessType)}"> <div class="form-control-static" th:text="${operLog.title} + ' / ' + ${@dict.getLabel('sys_oper_type',operLog.businessType)}">
</div> </div>x
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">登录信息：</label> <label class="col-sm-2 control-label">登录信息：</label>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/details.html
View file @ ade2dce6
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<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="col-sm-8">
<input name="performanceTitle" th:field="*{ticketVo.title}" class="form-control" type="text" required> <input name="performanceTitle" th:field="*{ticketsVo.title}" class="form-control" type="text" required>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
...@@ -32,127 +32,124 @@ ...@@ -32,127 +32,124 @@
<input name="number" th:field="*{orderTicketVo.number}" class="form-control" type="text" required> <input name="number" th:field="*{orderTicketVo.number}" 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="col-sm-8">
<!-- <input name="payCountdownMinute" th:field="*{payCountdownMinute}" class="form-control" type="text" required>--> <input name="payCountdownMinute" th:field="*{ticketsVo.useStart}" 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="col-sm-8">
<!-- <input name="priceTotal" th:field="*{priceTotal}" class="form-control" type="text" required>--> <input name="priceTotal" th:field="*{orderTicketVo.priceTotal}" 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="col-sm-8">
<!-- <input name="priceVoucher" th:field="*{priceVoucher}" class="form-control" type="text" required>--> <input name="priceVoucher" th:field="*{orderTicketVo.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="col-sm-8">
<!-- <input name="priceActual" th:field="*{priceActual}" class="form-control" type="text" required>--> <input name="priceActual" th:field="*{orderTicketVo.priceActual}" 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="col-sm-8">
<!-- <input name="priceExpress" th:field="*{priceExpress}" class="form-control" type="text" required>--> <input name="priceExpress" th:field="*{orderTicketVo.priceExpress}" 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="col-sm-8">
<!-- <input name="priceRefund" th:field="*{priceRefund}" class="form-control" type="text" required>--> <input name="priceRefund" th:field="*{orderTicketVo.priceRefund}" 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="col-sm-8">
<!-- <input name="priceVoucher" th:field="*{priceVoucher}" class="form-control" type="text" required>--> <!-- <input name="priceVoucher" th:field="*{orderTicketVo.}" 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="col-sm-8">
<!-- <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="col-sm-8">
<!-- <input name="orderCode" th:field="*{orderCode}" class="form-control" type="text" required>--> <input name="orderCode" th:field="*{orderTicketVo.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="col-sm-8">
<!-- <div class="input-group date">--> <div class="input-group date">
<!-- <input name="createdAt" th:value="${#dates.format(kylinOrderTickets.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">
<!-- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>--> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<!-- </div>--> </div>
<!-- </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="col-sm-8">
<!-- <select name="paymentType" class="form-control m-b">--> <select name="paymentType" th:with="type=${@dict.getType('zhengzai_pay_type')}">
<!-- <option value="">所有</option>--> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{orderTicketVo.paymentType}" readonly></option>
<!-- </select>--> </select>
<!-- <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>--> </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="col-sm-8">-->
<!-- <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">支付时间：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="timePay" th:field="*{timePay}" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label is-required">取票方式：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <select name="getTicketType" class="form-control m-b" required>-->
<!-- <option value="">所有</option>-->
<!-- </select>-->
<!-- <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label is-required">取票人1：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="orderCode" th:field="*{orderCode}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- <label class="col-sm-3 control-label">证件号：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="orderCode" th:field="*{orderCode}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- <label class="col-sm-3 control-label">电话：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="orderCode" th:field="*{orderCode}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- <label class="col-sm-3 control-label">票务状态：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="orderCode" th:field="*{orderCode}" class="form-control" type="text" required>-->
<!-- </div>-->
<!-- <label class="col-sm-3 control-label">支付时间：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <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">
<label class="col-sm-3 control-label">支付时间：</label>
<div class="col-sm-8">
<input name="timePay" th:field="*{orderTicketVo.timePay}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<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>
</div>
<div th:each="ticketEntity,ticketEntityStat : *{orderTicketEntitiesVo}" class="select-list" >
<label class="col-sm-3 control-label is-required">取票人[[${ticketEntityStat.count}]]：</label>
<div class="col-sm-3">
<input th:value="${ticketEntity.enterName}" 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.isPayment}" class="form-control" type="text" readonly>
</div>
<label class="col-sm-3 control-label">出票状态：</label>
<div class="col-sm-3">
<input th:value="${ticketEntity.status}" class="form-control" type="text" readonly>
</div>
</div>
</form> </form>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "kylin/tickets"; var prefix = ctx + "kylin/tickets";
var payTypeDatas = [[${@dict.getType('zhengzai_pay_type')}]];
$("#form-tickets-edit").validate({ $("#form-tickets-edit").validate({
focusCleanup: true focusCleanup: true
}); });
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performanceCalendar/performanceCalendar.html
View file @ ade2dce6
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head> <head>
<th:block th:include="include :: header('演出列表')" /> <th:block th:include="include :: header('演出日历')" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
...@@ -12,21 +12,21 @@ ...@@ -12,21 +12,21 @@
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li class="select-time"> <li class="select-time">
<!-- <label th:style="'width:120px'">请选择时间范围2： </label>--> <!-- <label th:style="'width:120px'">请选择时间范围2： </label>-->
<!-- <input type="text" id="perStartTime" placeholder="开始日期" name="params[beginTime]"/>--> <!-- <input type="text" id="perStartTime" placeholder="开始日期" name="params[beginTime]"/>-->
<!-- <span>-</span>--> <!-- <span>-</span>-->
<!-- <input type="text" id="perEndTime" placeholder="结束日期" name="params[endTime]"/>--> <!-- <input type="text" id="perEndTime" placeholder="结束日期" name="params[endTime]"/>-->
<label th:style="'width:120px'">请选择时间范围2： </label> <label th:style="'width:120px'">请选择时间范围2： </label>
<input th:field="${requestParam.timeBegin}" type="text" class="input-sm form-control" id="perStartTime" placeholder="yyyy-MM-dd" name="timeBegin"/> <input th:field="${requestParam.timeBegin}" type="text" class="input-sm form-control" id="perStartTime" placeholder="yyyy-MM-dd" name="timeBegin"/>
<span>-</span> <span>-</span>
<input th:field="${requestParam.timeEnd}" type="text" class="input-sm form-control" id="perEndTime" placeholder="yyyy-MM-dd" name="timeEnd" readonly/> <input th:field="${requestParam.timeEnd}" type="text" class="input-sm form-control" id="perEndTime" placeholder="yyyy-MM-dd" name="timeEnd" readonly/>
</li> </li>
<!-- <li>--> <!-- <li>-->
<!-- <label th:style="'width:120px'">请选择时间范围： </label>--> <!-- <label th:style="'width:120px'">请选择时间范围： </label>-->
<!-- <input type="text" id="perStartTime" placeholder="开始日期" name="params[beginTime]"/>--> <!-- <input type="text" id="perStartTime" placeholder="开始日期" name="params[beginTime]"/>-->
<!-- <span>-</span>--> <!-- <span>-</span>-->
<!-- <input type="text" id="perEndTime" placeholder="结束日期" name="params[endTime]"/>--> <!-- <input type="text" id="perEndTime" placeholder="结束日期" name="params[endTime]"/>-->
<!-- </li>--> <!-- </li>-->
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="submit()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="submit()"><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>
...@@ -35,6 +35,148 @@ ...@@ -35,6 +35,148 @@
</div> </div>
</form> </form>
</div> </div>
<div class="comments-top-top">
<div class="top-comment-left">
</div>
</div>
<div class="fixed-table-body">
<div class="fixed-table-loading table table-bordered table-hover open" style="top: 35px; display: none;">
<span class="loading-wrap">
<span class="loading-text" style="font-size: 13px;">正在努力地加载数据中，请稍候</span>
<span class="animation-wrap"><span class="animation-dot"></span></span>
</span>
</div>
<table id="bootstrap-table2" class="table table-bordered table-hover">
<thead class="">
<tr>
<th style="" data-field="mon">
<div class="th-inner ">Mon</div>
<div class="fht-cell"></div>
</th>
<th style="" data-field="tue">
<div class="th-inner ">Tue</div>
<div class="fht-cell"></div>
</th>
<th style="" data-field="wed">
<div class="th-inner ">Wed</div>
<div class="fht-cell"></div>
</th>
<th style="" data-field="thu">
<div class="th-inner ">Thu</div>
<div class="fht-cell"></div>
</th>
<th style="" data-field="fri">
<div class="th-inner ">Fri</div>
<div class="fht-cell"></div>
</th>
<th style="" data-field="sat">
<div class="th-inner ">Sat</div>
<div class="fht-cell"></div>
</th>
<th style="" data-field="sun">
<div class="th-inner ">Sun</div>
<div class="fht-cell"></div>
</th>
</tr>
</thead>
<tbody th:each="respBean,respBeanStat:${respDataList}">
<tr>
<td>
<div th:each="performanceVo:${respBean.monList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
</ul>
</div>
</td>
<td>
<div th:each="performanceVo:${respBean.tueList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
</ul>
</div>
</td>
<td>
<div th:each="performanceVo:${respBean.wedList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
</ul>
</div>
</td>
<td>
<div th:each="performanceVo:${respBean.thuList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
</ul>
</div>
</td>
<td>
<div th:each="performanceVo:${respBean.friList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
</ul>
</div>
</td>
<td>
<div th:each="performanceVo:${respBean.satList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
</ul>
</div>
</td>
<td>
<div th:each="performanceVo:${respBean.sunList}">
<ul>
<li><span class="left-at">[[${performanceVo.cityName}]]</span></li>
<li><span class="right-at">[[${performanceVo.timeStart}]]</span></li>
<li><span class="right-at">[[${performanceVo.title}]]</span></li>
</ul>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<!-- <div class="col-sm-12 select-table table-bordered">-->
<!-- <table id="bootstrap-table"></table>-->
<!-- </div>-->
<!-- <div>-->
<!-- <div class="calendar-day" :class="data.isSelected ? 'is-selected' : ''">-->
<!-- {{ data.day.split('-').slice(1).join('-') }} {{ data.isSelected ? '✔️' : '' }}-->
<!-- </div>-->
<!-- <div id="index" class="calendar-data">-->
<!-- <div>-->
<!-- <div>-->
<!-- <div th:each="entries,stat:${resultList}" effect="dark" value="item.title">-->
<!-- <div>-->
<!-- <div class="city">-->
<!-- <el-button size="mini" type="primary" plain>-->
<!-- {{ item.city_name }}-->
<!-- </el-button>-->
<!-- {{ item.time_start }}-->
<!-- </div>-->
<!-- <div class="title">-->
<!-- {{ item.title }}-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div> </div>
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
...@@ -47,12 +189,49 @@ ...@@ -47,12 +189,49 @@
var selectListUrl = ctx + "kylin/performanceCalendar/list"; var selectListUrl = ctx + "kylin/performanceCalendar/list";
function submit(){ function submit(){
debugger;
var queryData = $.common.formToJSON("formId"); var queryData = $.common.formToJSON("formId");
$.operate.post(selectListUrl,queryData,function (res) { $.operate.post(selectListUrl,queryData);
location.reload();
});
} }
$(function() { $(function() {
var options = {
url: prefix + "/list",
sortName: "sort",
modalName: "演出",
columns: [{
checkbox: false
},
{
field: 'mon',
title: 'Mon'
},
{
field: 'tue',
title: 'Tue'
},
{
field: 'wed',
title: 'Wed'
},
{
field: 'thu',
title: 'Thu'
},
{
field: 'fri',
title: 'Fri'
},
{
field: 'sat',
title: 'Sat'
},
{
field: 'sun',
title: 'Sun'
}]
};
// $.table.init(options);
<!-- laydate示例 --> <!-- laydate示例 -->
layui.use(['laydate'], function(){ layui.use(['laydate'], function(){
var laydate = layui.laydate; var laydate = layui.laydate;
......
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 @ ade2dce6
...@@ -8,11 +8,11 @@ import com.liquidnet.commons.lang.util.DateUtil; ...@@ -8,11 +8,11 @@ import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dao.OrderTicketsListDao; import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
import com.liquidnet.service.kylin.dto.param.admin.OrderListReq; import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
import com.liquidnet.service.kylin.dto.vo.admin.OrderDetailsAdminVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo; import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo; 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.dto.vo.returns.OrderDetailsVo;
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.admin.IKylinOrderTicketsAdminService; import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
...@@ -72,8 +72,8 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -72,8 +72,8 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
} }
@Override @Override
public OrderDetailsVo orderDetails(String orderId) { public OrderDetailsAdminVo orderDetails(String orderId) {
OrderDetailsVo vo = new OrderDetailsVo(); OrderDetailsAdminVo vo = new OrderDetailsAdminVo();
try { try {
//查询条件 //查询条件
LambdaQueryWrapper<KylinOrderTickets> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<KylinOrderTickets> wrapper = new LambdaQueryWrapper<>();
...@@ -145,6 +145,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic ...@@ -145,6 +145,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
vo.setExpress_number(""); vo.setExpress_number("");
vo.setExpress_company(""); vo.setExpress_company("");
vo.setKuaidi_status(-2); vo.setKuaidi_status(-2);
vo.setTicketsVo(ticketVo);
vo.setOrderTicketEntitiesVo(kylinOrderTicketEntitiesVoList); vo.setOrderTicketEntitiesVo(kylinOrderTicketEntitiesVoList);
vo.setPerformanceVo(performanceVo); vo.setPerformanceVo(performanceVo);
vo.setOrderTicketVo(orderTicketVo); vo.setOrderTicketVo(orderTicketVo);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinLackRegistersServiceImpl.java
View file @ ade2dce6
...@@ -37,7 +37,7 @@ public class KylinLackRegistersServiceImpl extends ServiceImpl<KylinLackRegister ...@@ -37,7 +37,7 @@ public class KylinLackRegistersServiceImpl extends ServiceImpl<KylinLackRegister
lackRegisters.setIpAddress(CurrentUtil.getCliIpAddr()); lackRegisters.setIpAddress(CurrentUtil.getCliIpAddr());
lackRegisters.setCreatedAt(LocalDateTime.now()); lackRegisters.setCreatedAt(LocalDateTime.now());
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL, rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("kylin_order_ticket_status.close", lackRegisters.getInsertObj())); SqlMapping.get("kylin_lack_register.insert", lackRegisters.getInsertObj()));
return ResponseDto.success("登记成功"); return ResponseDto.success("登记成功");
}catch (Exception e){ }catch (Exception e){
return ResponseDto.success("登记失败"); return ResponseDto.success("登记失败");
......
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