Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
259e7d9f
authored
Aug 02, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
赛事活动,增加批处理:仅处理完成
parent
db7b035f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
113 additions
and
1 deletions
src/main/java/com/ctrip/fun/admin/controller/order/OpEventActivityOrderController.java
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListAll.ftl
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListProcessing.ftl
src/main/java/com/ctrip/fun/admin/controller/order/OpEventActivityOrderController.java
View file @
259e7d9f
...
@@ -306,6 +306,50 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
...
@@ -306,6 +306,50 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
return
null
;
return
null
;
}
}
/**
* 批量确认处理完成
* @param request
* @param orderId
* @param operator
* @param isMsg
* @param orderStatus
* @param teeTime
* @param map
* @return
* Add by lyhuang
*/
@ResponseBody
@RequestMapping
(
value
=
"/confirmEventActivityOrderResourceBatch"
,
method
=
RequestMethod
.
POST
)
public
Integer
confirmEventActivityOrderResourceBatch
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"orderIds"
,
required
=
true
)
String
orderIds
,
ModelMap
map
)
{
if
(
org
.
apache
.
commons
.
lang
.
StringUtils
.
isBlank
(
orderIds
)){
return
-
1
;
}
int
isMsg
=
0
;
String
operator
=
"caosy"
;
String
orderStatus
=
"WAITING_DEAL"
;
String
orderStrArr
[]
=
orderIds
.
split
(
","
);
int
[]
orderIntArr
=
new
int
[
orderStrArr
.
length
];
for
(
int
i
=
0
;
i
<
orderStrArr
.
length
;
i
++){
orderIntArr
[
i
]
=
Integer
.
parseInt
(
orderStrArr
[
i
]);
OpEventActivityOrderBean
orderBean
=
opEventActivityOrderService
.
getDetail
(
""
,
orderIntArr
[
i
]);
if
(
orderBean
.
getOrderStatus
().
equals
(
orderStatus
))
{
EventActivityOrderProcessBean
processBean
=
new
EventActivityOrderProcessBean
();
processBean
.
setOperateTime
(
new
Date
());
processBean
.
setAni
(
"021-123"
);
processBean
.
setOperator
(
operator
);
processBean
.
setOrderId
(
orderIntArr
[
i
]);
processBean
.
setProcessDesc
(
""
);
processBean
.
setTeeTime
(
orderBean
.
getTeeTime
());
processBean
.
setUcid
(
"123456"
);
processBean
.
setProductId
(
orderBean
.
getProductId
());
processBean
.
setSendMsg
(
isMsg
==
1
?
true
:
false
);
processBean
.
setOperateType
(
OrderProcessEnum
.
CONFIRM_RESOURCE
.
getOperationCode
());
// 确认资源
opEventActivityOrderService
.
confirmEventActivityOrderResource
(
""
,
processBean
);
}
}
return
1
;
}
@RequestMapping
(
value
=
"/confirmEventActivityOrderResource"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/confirmEventActivityOrderResource"
,
method
=
RequestMethod
.
POST
)
public
String
confirmEventActivityOrderResource
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"orderId"
,
required
=
true
)
int
orderId
,
public
String
confirmEventActivityOrderResource
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"orderId"
,
required
=
true
)
int
orderId
,
@RequestParam
(
value
=
"operator"
,
required
=
true
)
String
operator
,
@RequestParam
(
value
=
"isMsg"
,
required
=
true
)
int
isMsg
,
@RequestParam
(
value
=
"operator"
,
required
=
true
)
String
operator
,
@RequestParam
(
value
=
"isMsg"
,
required
=
true
)
int
isMsg
,
...
...
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListAll.ftl
View file @
259e7d9f
<#include "../common/pageJsContent.ftl"/>
<#include "../common/pageJsContent.ftl"/>
<#assign pageJsContent>
<script type="text/javascript">
</script>
</#assign>
<@com.layout title="全部订单" module="eventActivityOrder" current="list_all" pageJs=pageJsContent>
<@com.layout title="全部订单" module="eventActivityOrder" current="list_all" pageJs=pageJsContent>
<#include "../common/eventActivityOrderSearchForm.ftl"/>
<#include "../common/eventActivityOrderSearchForm.ftl"/>
<table class="table table-bordered table-striped table-font">
<table class="table table-bordered table-striped table-font">
<thead>
<tr>
<tr>
<th>订单号</th>
<th>订单号</th>
<th>用户ID</th>
<th>用户ID</th>
...
@@ -17,9 +27,11 @@
...
@@ -17,9 +27,11 @@
<th>已存发票信息</th>
<th>已存发票信息</th>
<th>订单来源</th>
<th>订单来源</th>
</tr>
</tr>
</thead>
<tbody class="J_shift">
<#list list as item>
<#list list as item>
<tr>
<tr>
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}¤t=list_all">${item.orderNo?c}</a></td>
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}¤t=list_all">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.orderName!}</td>
<td>${item.orderName!}</td>
...
@@ -36,6 +48,7 @@
...
@@ -36,6 +48,7 @@
<td>${item.orderSourceCategory!}</td>
<td>${item.orderSourceCategory!}</td>
</tr>
</tr>
</#list>
</#list>
</tbody>
</table>
</table>
<div class="row-fluid">
<div class="row-fluid">
<div class="pagination pagination-left">
<div class="pagination pagination-left">
...
...
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListProcessing.ftl
View file @
259e7d9f
<#include "../common/pageJsContent.ftl"/>
<#include "../common/pageJsContent.ftl"/>
<#assign pageJsContent>
<script type="text/javascript">
//全选或者全不选
function shiftCheckAll(){
if($('#checkAll').is(':checked')) {
$(".J_shift :checkbox").prop("checked", true);
}else{
$(".J_shift :checkbox").prop("checked", false);
}
}
$('#chgbtn').click(function () {
var checkboxes = $('[name="datacheck"]:checked');
if (checkboxes.length == 0) {
alert("请选择要修改的资源");
} else {
$(this).button('loading');
var chgids = "";
var checkboxes = $('[name="datacheck"]:checked');
checkboxes.each(function () {
chgids = chgids + $(this).attr("id") + ",";
});
chgids = chgids.substr(0, chgids.length - 1);
// $("#orderIds").val(chgids);
$.post("/eventActivityOrder/confirmEventActivityOrderResourceBatch",{"orderIds":chgids},function(data){
if(data==1){
alert("处理完成, 重新加载页面!");
window.location.reload();
}
});
}
});
</script>
</#assign>
<@com.layout title="待处理订单" module="eventActivityOrder" current="list_processing" pageJs=pageJsContent>
<@com.layout title="待处理订单" module="eventActivityOrder" current="list_processing" pageJs=pageJsContent>
<#include "../common/eventActivityOrderSearchForm.ftl"/>
<#include "../common/eventActivityOrderSearchForm.ftl"/>
<button type="button" class="btn btn-default" data-toggle="button" id="chgbtn">仅处理完成</button>
<table class="table table-bordered table-striped table-font">
<table class="table table-bordered table-striped table-font">
<thead>
<tr>
<tr>
<th><input type="checkbox" name="checkAll" id="checkAll" onclick="shiftCheckAll();"></th>
<th>订单号</th>
<th>订单号</th>
<th>用户ID</th>
<th>用户ID</th>
<th>名称</th>
<th>名称</th>
...
@@ -17,8 +61,17 @@
...
@@ -17,8 +61,17 @@
<th>订单来源</th>
<th>订单来源</th>
</tr>
</tr>
</thead>
<tbody class="J_shift">
<#list list as item>
<#list list as item>
<tr>
<tr>
<td>
<label class="checkbox">
<input type="checkbox" name="datacheck" data-index="${item_index}" id="${item.orderId}"
class="J_shiftCheck J_check-${item_index}" value="">
</label>
</td>
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}¤t=list_processing">${item.orderNo?c}</a></td>
<td><a href="/eventActivityOrder/detail?orderId=${item.orderId}¤t=list_processing">${item.orderNo?c}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td><a href="/system/user/${item.uid}/detailByUid" target="_blank">${item.uid}</a></td>
<td>${item.orderName!}</td>
<td>${item.orderName!}</td>
...
@@ -33,6 +86,8 @@
...
@@ -33,6 +86,8 @@
<td>${item.orderSourceCategory!}</td>
<td>${item.orderSourceCategory!}</td>
</tr>
</tr>
</#list>
</#list>
</tbody>
</table>
</table>
<div class="row-fluid">
<div class="row-fluid">
<div class="pagination pagination-left">
<div class="pagination pagination-left">
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment