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
ccdc0493
authored
Nov 23, 2018
by
chongli
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-admin into f-6.7.0
parents
e1cf3116
9ca6fa78
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
181 additions
and
10 deletions
src/main/java/com/ctrip/fun/admin/controller/order/OpEventActivityOrderController.java
src/main/java/com/ctrip/fun/admin/controller/order/OpTourOrderController.java
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListProcessing.ftl
src/main/webapp/WEB-INF/templates/tourOrder/list/tourOrderListProcessing.ftl
src/main/java/com/ctrip/fun/admin/controller/order/OpEventActivityOrderController.java
View file @
ccdc0493
...
...
@@ -320,11 +320,14 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
*/
@ResponseBody
@RequestMapping
(
value
=
"/confirmEventActivityOrderResourceBatch"
,
method
=
RequestMethod
.
POST
)
public
Integer
confirmEventActivityOrderResourceBatch
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"orderIds"
,
required
=
true
)
String
orderIds
,
ModelMap
map
)
{
public
Integer
confirmEventActivityOrderResourceBatch
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"orderIds"
,
required
=
true
)
String
orderIds
,
@RequestParam
(
value
=
"isMsg"
,
required
=
true
)
int
isMsg
,
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
(
","
);
...
...
src/main/java/com/ctrip/fun/admin/controller/order/OpTourOrderController.java
View file @
ccdc0493
...
...
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
com.ctrip.fun.admin.form.PaginationForm
;
import
com.ctrip.fun.admin.form.order.OrderPayForm
;
...
...
@@ -32,10 +33,13 @@ import com.ctrip.fun.admin.service.order.OpTourOrderService;
import
com.ctrip.fun.admin.service.order.TourExcelExportService
;
import
com.ctrip.fun.admin.service.tour.TourBasicService
;
import
com.ctrip.fun.admin.utility.OrderUtil
;
import
com.ctrip.fun.admin.utility.SpringSecurityUtil
;
import
com.ctrip.fun.common.core.util.BeanConverter
;
import
com.ctrip.fun.common.core.util.DateUtil
;
import
com.ctrip.fun.common.vo.PagedResponseBean
;
import
com.ctrip.fun.common.vo.basic.VoucherBean
;
import
com.ctrip.fun.common.vo.order.EventActivityOrderProcessBean
;
import
com.ctrip.fun.common.vo.order.OpEventActivityOrderBean
;
import
com.ctrip.fun.common.vo.order.OpOrderQuery
;
import
com.ctrip.fun.common.vo.order.OpTourOrderBean
;
import
com.ctrip.fun.common.vo.order.OrderNotifyEnum
;
...
...
@@ -751,6 +755,80 @@ public class OpTourOrderController extends AbstractOpOrderController<TourOrderQu
return
result
;
}
/**
* TODO: 套餐 批量处理完成
* 批量确认处理完成
* Add by lyhuang
*/
@ResponseBody
@RequestMapping
(
value
=
"/confirmTourOrderResourceBatch"
,
method
=
RequestMethod
.
POST
)
public
Integer
confirmTourOrderResourceBatch
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"orderIds"
,
required
=
true
)
String
orderIds
,
@RequestParam
(
value
=
"isMsg"
,
required
=
true
)
int
isMsg
,
ModelMap
map
)
{
String
operator
=
SpringSecurityUtil
.
getCurrentUserName
();
String
orderStatus
=
"WAITING_DEAL"
;
String
orderStrArr
[]
=
orderIds
.
split
(
","
);
int
[]
orderIntArr
=
new
int
[
orderStrArr
.
length
];
for
(
int
i
=
0
;
i
<
orderStrArr
.
length
;
i
++){
String
result
=
null
;
orderIntArr
[
i
]
=
Integer
.
parseInt
(
orderStrArr
[
i
]);
OpTourOrderBean
orderBean
=
opTourOrderService
.
getDetail
(
""
,
orderIntArr
[
i
]);
if
(
orderBean
.
getOrderStatus
().
equals
(
orderStatus
))
{
result
=
"redirect:/tourOrder/orderList/"
+
OrderUtil
.
getListPageByStatus
(
orderStatus
);
TourOrderProcessBean
processBean
=
new
TourOrderProcessBean
();
processBean
.
setOperateTime
(
new
Date
());
processBean
.
setAni
(
"021-123"
);
processBean
.
setOperator
(
operator
);
processBean
.
setOrderId
(
orderIntArr
[
i
]);
processBean
.
setProcessDesc
(
"列表批量处理<br/>"
);
// processBean.setRealPlayTime(realPayTime); //实际出行时间
processBean
.
setUcid
(
"123456"
);
processBean
.
setSendMsg
(
isMsg
==
1
?
true
:
false
);
processBean
.
setOperateType
(
OrderProcessEnum
.
CONFIRM_RESOURCE
.
getOperationCode
());
// 确认资源
OrderPayinfoBean
payinfoBean
=
new
OrderPayinfoBean
();
// payinfoBean.setCashAmount(cashAmount);
// payinfoBean.setPayeeId(payeeId);
// payinfoBean.setPayeeName(payeeName);
// payinfoBean.setPrePayAmount(prePayAmount);
processBean
.
setOrderPayinfoBean
(
payinfoBean
);
opTourOrderService
.
confirmResource
(
""
,
processBean
);
}
else
{
map
.
put
(
"changedStatus"
,
OrderStatusEnum
.
getOrderStatusEnum
(
orderBean
.
getOrderStatus
()).
getShowStatusName
());
result
=
"redirect:/tourOrder/orderList/"
+
OrderUtil
.
getListPageByStatus
(
orderStatus
)
+
"?changedStatus="
+
orderBean
.
getOrderStatus
();
}
}
return
1
;
/*int isMsg = 0;
String operator = SpringSecurityUtil.getCurrentUserName();
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]);
OpTourOrderBean orderBean = opTourOrderService.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()); // 确认资源
opTourOrderService.confirmResource("", processBean);
}
}*/
// return 1;
}
/*
* 交易完成并解冻
*/
...
...
src/main/webapp/WEB-INF/templates/eventActivityOrder/list/eventActivityOrderListProcessing.ftl
View file @
ccdc0493
...
...
@@ -11,8 +11,15 @@
}
$('#chgbtn').click(function () {
batchDeal(0);
});
$('#chgbtnAndMsg').click(function () {
batchDeal(1);
});
var checkboxes = $('[name="datacheck"]:checked');
function batchDeal(msg){
var checkboxes = $('[name="datacheck"]:checked');
if (checkboxes.length == 0) {
alert("请选择要修改的资源");
} else {
...
...
@@ -23,25 +30,22 @@
chgids = chgids + $(this).attr("id") + ",";
});
chgids = chgids.substr(0, chgids.length - 1);
// $("#orderIds").val(chgids);
$.post("/eventActivityOrder/confirmEventActivityOrderResourceBatch",{"orderIds":chgids},function(data){
$.post("/eventActivityOrder/confirmEventActivityOrderResourceBatch",{"orderIds":chgids
,"isMsg":msg
},function(data){
if(data==1){
alert("处理完成, 重新加载页面!");
window.location.reload();
}
});
}
});
}
</script>
</#assign>
<@com.layout title="待处理订单" module="eventActivityOrder" current="list_processing" pageJs=pageJsContent>
<#include "../common/eventActivityOrderSearchForm.ftl"/>
<button type="button" class="btn btn-default" data-toggle="button" id="chgbtn">仅处理完成</button>
<button type="button" class="btn btn-default" data-toggle="button" id="chgbtnAndMsg">完成并发送短信</button>
<table class="table table-bordered table-striped table-font">
<thead>
...
...
src/main/webapp/WEB-INF/templates/tourOrder/list/tourOrderListProcessing.ftl
View file @
ccdc0493
<#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("/tourOrder/confirmTourOrderResourceBatch",{"orderIds":chgids},function(data){
if(data==1){
alert("处理完成, 重新加载页面!");
window.location.reload();
}
});
**/
}
});
$('#chgbtn').click(function () {
batchDeal(0);
});
$('#chgbtnAndMsg').click(function () {
batchDeal(1);
});
function batchDeal(msg){
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("/tourOrder/confirmTourOrderResourceBatch",{"orderIds":chgids,"isMsg":msg},function(data){
if(data==1){
alert("处理完成, 重新加载页面!");
window.location.reload();
}
});
}
}
</script>
</#assign>
<@com.layout title="等待处理套餐订单" module="tourOrder" current="list_processing" pageJs=pageJsContent>
<#include "../common/TourOrderSearchForm.ftl"/>
<button type="button" class="btn btn-default" data-toggle="button" id="chgbtn">处理完成</button>
<button type="button" class="btn btn-default" data-toggle="button" id="chgbtnAndMsg">完成并发送短信</button>
<table class="table table-bordered table-striped table-font">
<thead>
<tr>
<th><input type="checkbox" name="checkAll" id="checkAll" onclick="shiftCheckAll();"></th>
<th>订单号</th>
<th>联系人</th>
<th>订单名称</th>
...
...
@@ -14,9 +92,16 @@
<th>状态</th>
<th>接管人</th>
</tr>
</thead>
<tbody class="J_shift">
<#list list as item>
<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="/tourOrder/detail?orderId=${item.orderId}¤t=list_processing">${item.orderNo?c}</a></td>
<td>${item.userName}</td>
<td>${item.orderName}</td>
...
...
@@ -29,6 +114,7 @@
<td>${item.receiver!}</td>
</tr>
</#list>
</tbody>
</table>
<div class="row-fluid">
<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