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
d2c18a1a
authored
Jan 24, 2019
by
Huang Linyu
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
92298f9c
9d4b25d6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
90 additions
and
39 deletions
src/main/java/com/ctrip/fun/admin/controller/order/AbstractOpOrderController.java
src/main/java/com/ctrip/fun/admin/controller/order/OpTourOrderController.java
src/main/webapp/WEB-INF/templates/basic/invoiceRequest/invoiceRequestForm.ftl
src/main/webapp/WEB-INF/templates/order/list/OrderListProcessing.ftl
src/main/java/com/ctrip/fun/admin/controller/order/AbstractOpOrderController.java
View file @
d2c18a1a
...
...
@@ -26,6 +26,7 @@ import com.ctrip.fun.admin.form.order.OrderPayForm;
import
com.ctrip.fun.admin.service.order.AbstractOpOrderService
;
import
com.ctrip.fun.admin.service.system.UserService
;
import
com.ctrip.fun.admin.service.tools.ToolsService
;
import
com.ctrip.fun.admin.utility.SpringSecurityUtil
;
import
com.ctrip.fun.common.core.util.BeanConverter
;
import
com.ctrip.fun.common.vo.PagedResponseBean
;
import
com.ctrip.fun.common.vo.Response
;
...
...
@@ -34,6 +35,7 @@ import com.ctrip.fun.common.vo.basic.SysCodeQuery;
import
com.ctrip.fun.common.vo.order.AbstractOpOrderBean
;
import
com.ctrip.fun.common.vo.order.AbstractOrderProcessBean
;
import
com.ctrip.fun.common.vo.order.InvoiceBean
;
import
com.ctrip.fun.common.vo.order.OpTourOrderBean
;
import
com.ctrip.fun.common.vo.order.OrderAssignmentBean
;
import
com.ctrip.fun.common.vo.order.OrderProcessEnum
;
import
com.ctrip.fun.common.vo.order.OrderProcessLogBean
;
...
...
@@ -132,6 +134,42 @@ public abstract class AbstractOpOrderController<H extends AbstractOrderQueryForm
model
.
put
(
"key"
,
"1"
);
return
result
;
}
/**
* TODO: 套餐 批量处理完成
* 批量确认处理完成
* Add by lyhuang
*/
@ResponseBody
@RequestMapping
(
value
=
"/batchReceive"
,
method
=
RequestMethod
.
POST
)
public
Integer
batchReceive
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"orderIds"
,
required
=
true
)
String
orderIds
,
ModelMap
map
)
{
String
operator
=
SpringSecurityUtil
.
getCurrentUserName
();
String
orderStrArr
[]
=
orderIds
.
split
(
","
);
int
[]
orderIntArr
=
new
int
[
orderStrArr
.
length
];
for
(
int
i
=
0
;
i
<
orderStrArr
.
length
;
i
++)
{
orderIntArr
[
i
]
=
Integer
.
parseInt
(
orderStrArr
[
i
]);
T
orderBean
=
(
T
)
getOpOrderService
().
getDetail
(
""
,
orderIntArr
[
i
]);
orderBean
.
setPayMode
(
ProductPaymentTypeEnum
.
nameOf
(
orderBean
.
getPayMode
()).
getMsg
());
orderBean
.
setOrderSourceString
(
OrderSourceEnum
.
valueOf
(
orderBean
.
getOrderSource
()));
orderBean
.
setOrderStatusString
(
OrderStatusEnum
.
getOrderStatusEnum
(
orderBean
.
getOrderStatus
()).
getShowStatusName
());
OrderAssignmentBean
bean
=
new
OrderAssignmentBean
();
bean
.
setOrderId
(
orderIntArr
[
i
]);
bean
.
setEid
(
operator
);
bean
.
setAssignmentTime
(
new
Date
());
getOpOrderService
().
receive
(
""
,
bean
);
OrderProcessLogBean
logBean
=
new
OrderProcessLogBean
();
logBean
.
setOperator
(
operator
);
logBean
.
setOrderId
(
orderIntArr
[
i
]);
logBean
.
setProcessDesc
(
operator
+
"接管订单"
);
logBean
.
setUcid
(
"123456"
);
logBean
.
setAni
(
"021-123"
);
getOpOrderService
().
addLog
(
""
,
logBean
);
}
return
1
;
}
/*
* 更新订单来源类型 线上线下转换
...
...
src/main/java/com/ctrip/fun/admin/controller/order/OpTourOrderController.java
View file @
d2c18a1a
...
...
@@ -832,44 +832,6 @@ public class OpTourOrderController extends AbstractOpOrderController<TourOrderQu
}
/**
* TODO: 套餐 批量处理完成
* 批量确认处理完成
* Add by lyhuang
*/
@ResponseBody
@RequestMapping
(
value
=
"/batchReceive"
,
method
=
RequestMethod
.
POST
)
public
Integer
batchReceive
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"orderIds"
,
required
=
true
)
String
orderIds
,
ModelMap
map
)
{
String
operator
=
SpringSecurityUtil
.
getCurrentUserName
();
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
]);
orderBean
.
setPayMode
(
ProductPaymentTypeEnum
.
nameOf
(
orderBean
.
getPayMode
()).
getMsg
());
orderBean
.
setOrderSourceString
(
OrderSourceEnum
.
valueOf
(
orderBean
.
getOrderSource
()));
orderBean
.
setOrderStatusString
(
OrderStatusEnum
.
getOrderStatusEnum
(
orderBean
.
getOrderStatus
()).
getShowStatusName
());
OrderAssignmentBean
bean
=
new
OrderAssignmentBean
();
bean
.
setOrderId
(
orderIntArr
[
i
]);
bean
.
setEid
(
operator
);
bean
.
setAssignmentTime
(
new
Date
());
getOpOrderService
().
receive
(
""
,
bean
);
OrderProcessLogBean
logBean
=
new
OrderProcessLogBean
();
logBean
.
setOperator
(
operator
);
logBean
.
setOrderId
(
orderIntArr
[
i
]);
logBean
.
setProcessDesc
(
operator
+
"接管订单"
);
logBean
.
setUcid
(
"123456"
);
logBean
.
setAni
(
"021-123"
);
getOpOrderService
().
addLog
(
""
,
logBean
);
}
return
1
;
}
/*
* 交易完成并解冻
*/
...
...
src/main/webapp/WEB-INF/templates/basic/invoiceRequest/invoiceRequestForm.ftl
View file @
d2c18a1a
...
...
@@ -158,7 +158,7 @@ $("#deleteOrder").click(function(){
</div>
</div>
<@form.hidden "dto.contactAddress"/>
<@form.textInput path="dto.contactName" attributes="class=\"input-medium\"" label="寄送联系人" required = true />
<@form.textInput path="dto.contactTel" attributes="class=\"input-medium\"" label="联系方式" required = true />
<@form.textInput path="dto.invoiceRemark" attributes="class=\"input-medium\"" label="发票备注" required = true />
...
...
src/main/webapp/WEB-INF/templates/order/list/OrderListProcessing.ftl
View file @
d2c18a1a
<#include "../common/pageJsContent.ftl"/>
<#assign pageJsContent>
<script type="text/javascript">
$('#batchReserve').click(function () {
batchDeal(2);
});
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);
if(msg==0||msg==0){
$.post("/tourOrder/confirmTourOrderResourceBatch",{"orderIds":chgids,"isMsg":msg},function(data){
if(data==1){
alert("处理完成, 重新加载页面!");
window.location.reload();
}
});
}else{
$.post("/order/batchReceive",{"orderIds":chgids},function(data){
if(data==1){
alert("处理完成, 重新加载页面!");
window.location.reload();
}
});
}
}
}
</script>
</#assign>
<@com.layout title="等待处理订单" module="order" current="list_processing" pageJs=pageJsContent>
<#include "../common/OrderSearchForm.ftl"/>
<button type="button" class="btn btn-default" style='margin-top:10px' data-toggle="button" id="batchReserve">批量接管</button>
<table class="table table-bordered table-striped">
<tr>
<th><input type="checkbox" name="checkAll" id="checkAll" onclick="shiftCheckAll();"></th>
<th>订单号</th>
<th>联系人</th>
<th>订单名称</th>
...
...
@@ -19,6 +64,12 @@
<#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="/order/detail?orderId=${item.orderId}¤t=list_processing">${item.orderNo?c}</a></td>
<td>${item.userName}</td>
<td>${item.orderName}</td>
...
...
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