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

Skip to content

L
liquidnet-bus-v1
Commit 245e4668 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

提交 根据端订单 查询大麦单号

parent 249188d7
Show whitespace changes
Inline Side-by-side
Showing with 225 additions and 176 deletions
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 @ 245e4668
......@@ -264,7 +264,7 @@ public class KylinOrderRefundAdminController extends BaseController {
@ResponseBody
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "订单号", example = ""),
@ApiImplicitParam(type = "form", required = true, dataType = "int", name = "type", value = "1退款单号 2订单号", example = ""),
@ApiImplicitParam(type = "form", required = true, dataType = "int", name = "type", value = "1退款单号 2订单号 3大麦单号", example = ""),
})
public AjaxResult loginSmsSwitch(@NotNull(message = "订单号不能为空") @RequestParam String code,
@NotNull(message = "类型不能为空") @RequestParam int type) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/order/OrderSwitchAdminController.java
View file @ 245e4668
......@@ -30,7 +30,7 @@ public class OrderSwitchAdminController {
@ApiOperation(value = "根据截取订单号获取全量订单号")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "订单号", example = ""),
@ApiImplicitParam(type = "form", required = true, dataType = "int", name = "type", value = "1退款单号 2订单号", example = ""),
@ApiImplicitParam(type = "form", required = true, dataType = "int", name = "type", value = "1退款单号 2订单号 3大麦单号", example = ""),
})
@PostMapping("search/code")
public ResponseDto<Object> loginSmsSwitch(@NotNull(message = "订单号不能为空") @RequestParam String code,
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @ 245e4668
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('订单列表')" />
<th:block th:include="include :: header('订单列表')"/>
</head>
<body class="gray-bg">
<div class="container-div">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId" >
<form id="formId">
<div class="select-list">
<ul>
<li>
......@@ -24,9 +24,11 @@
</li>
<li class="select-time">
<label>支付时间： </label>
<input type="text" class="time-input" id="timePayStart" placeholder="开始日期" name="params[beginTime]"/>
<input type="text" class="time-input" id="timePayStart" placeholder="开始日期"
name="params[beginTime]"/>
<span>-</span>
<input type="text" class="time-input" id="timePayEnd" placeholder="结束日期" name="params[endTime]"/>
<input type="text" class="time-input" id="timePayEnd" placeholder="结束日期"
name="params[endTime]"/>
</li>
<li>
<label>第三方：</label>
......@@ -34,7 +36,8 @@
<div class="input-group">
<input type="text" class="form-control" id="sponsorSelectDiv" name="sponsor">
<div class="input-group-btn">
<button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
<button type="button" class="btn btn-white dropdown-toggle"
data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
......@@ -47,65 +50,72 @@
<label>支付方式：</label>
<select name="payType" th:with="type=${@dict.getType('zhengzai_pay_type')}">
<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>
</li>
<li>
<label>订单状态：</label>
<select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}">
<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>
</li>
<li>
<label>客户端：</label>
<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>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>取票方式：</label>
<select name="getTicketType" th:with="type=${@dict.getType('zhengzai_get_ticket_type')}">
<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>
</li>
<li>
<label>快递状态：</label>
<select name="expressStatus" th:with="type=${@dict.getType('zhengzai_express_status')}">
<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>
</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>
<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>
</li>
</ul>
</div>
</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 search-collapse">
<form id="formId2">
......@@ -128,15 +138,36 @@
</form>
</div>
<div class="col-sm-12 search-collapse">
<form id="formId2">
<div class="select-list">
<ul>
<li>
<label>短订单号：</label>
<input type="text" name="damaiFindCode"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="findDamaiCode()"><i
class="fa fa-search"></i>&nbsp;查询</a>
</li>
<li>
<label>大麦单号：</label>
<input type="text" name="damaiAllCode" readonly/>
</li>
</ul>
</div>
</form>
</div>
<div class="col-sm-12 select-table table-bordered">
<table id="bootstrap-table"></table>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<th:block th:include="include :: bootstrap-suggest-js" />
<th:block th:include="include :: bootstrap-typeahead-js" />
<script th:inline="javascript">
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: bootstrap-suggest-js"/>
<th:block th:include="include :: bootstrap-typeahead-js"/>
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:order:orderlist:detail')}]];
var transferFlag = [[${@permission.hasPermi('kylin:order:orderlist:transferInit')}]];
var prefix = ctx + "kylin/order/orderList";
......@@ -154,7 +185,15 @@
});
}
$(function() {
function findDamaiCode() {
var shortCode = document.getElementsByName("damaiFindCode")[0].value;
var allCode = document.getElementsByName("damaiAllCode")[0];
$.operate.get(prefix2 + "/search/code?code=" + shortCode + "&type=3", function (res) {
allCode.value = res.msg;
});
}
$(function () {
var options = {
url: prefix + "/list",
detailUrl: prefix + "/detail/{id}",
......@@ -178,21 +217,21 @@
{
field: 'status',
title: '订单状态',
formatter: function(value, row, index) {
formatter: function (value, row, index) {
return $.table.selectDictLabel(orderStatusDic, value);
}
},
{
field: 'getTicketType',
title: '取票方式',
formatter: function(value, row, index) {
formatter: function (value, row, index) {
return $.table.selectDictLabel(getTicketTypeDic, value);
}
},
{
field: 'payType',
title: '支付方式',
formatter: function(value, row, index) {
formatter: function (value, row, index) {
return $.table.selectDictLabel(payTypeDic, value);
}
},
......@@ -231,7 +270,7 @@
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>详细</a>');
// actions.push('<a class="btn btn-warning btn-xs ' + transferFlag + '" href="javascript:void(0)" onclick="f(\'' + row.orderTicketsId + '\')"><i class="fa fa-search"></i>初始化</a>');
......@@ -255,10 +294,10 @@
});
function f(id) {
$.post(prefix + "/initTransfer",{orderId:id},function (res) {
$.post(prefix + "/initTransfer", {orderId: id}, function (res) {
alert(res.msg)
});
}
</script>
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderRefundsServiceImpl.java
View file @ 245e4668
......@@ -13,6 +13,7 @@ import com.liquidnet.client.admin.common.utils.DateUtils;
import com.liquidnet.client.admin.common.utils.ShiroUtils;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
......@@ -33,6 +34,7 @@ import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
import com.mongodb.BasicDBObject;
import com.mongodb.client.result.UpdateResult;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
......@@ -558,6 +560,14 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
} else {
orderCode = data.getOrderCode();
}
} else if (type == 3) {
KylinOrderTickets data = kylinOrderTicketsMapper.selectOne(new UpdateWrapper<KylinOrderTickets>().like("order_code", code));
if (data == null) {
return null;
} else {
String orderId = data.getOrderTicketsId();
orderCode = StringUtils.left(orderId, 5).concat(StringUtils.right(orderId, 8));
}
}
} catch (Exception e) {
......
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