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
24788585
authored
Nov 02, 2017
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add the modify the teetime in eventactivity
parent
1c35be84
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
74 additions
and
4 deletions
src/main/java/com/ctrip/fun/admin/controller/order/OpEventActivityOrderController.java
src/main/java/com/ctrip/fun/admin/service/order/OpEventActivityOrderService.java
src/main/resources/properties/service.properties
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetailTeeTime.ftl
src/main/webapp/WEB-INF/templates/eventActivityOrder/detail/orderDetailWithRefund.ftl
src/main/java/com/ctrip/fun/admin/controller/order/OpEventActivityOrderController.java
View file @
24788585
...
@@ -2,6 +2,8 @@ package com.ctrip.fun.admin.controller.order;
...
@@ -2,6 +2,8 @@ package com.ctrip.fun.admin.controller.order;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.text.DateFormat
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.text.SimpleDateFormat
;
import
java.util.Calendar
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -238,7 +240,22 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
...
@@ -238,7 +240,22 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
orderProcessBean
.
mapOperateResult
();
orderProcessBean
.
mapOperateResult
();
orderProcessBean
.
setOperation
(
OrderProcessEnum
.
valueOf
(
orderProcessBean
.
getOperateType
()).
getCname
());
orderProcessBean
.
setOperation
(
OrderProcessEnum
.
valueOf
(
orderProcessBean
.
getOperateType
()).
getCname
());
}
}
//add by caosy:teetime format
DateFormat
df
=
new
SimpleDateFormat
(
"mm:ss"
);
String
teetimeStr
=
orderBean
.
getTeeTime
();
if
(
teetimeStr
!=
null
){
try
{
Date
teeTime
=
df
.
parse
(
orderBean
.
getTeeTime
());
teetimeStr
=
df
.
format
(
teeTime
);
}
catch
(
ParseException
e
)
{
// TODO Auto-generated catch block
e
.
printStackTrace
();
}
}
else
{
teetimeStr
=
"00:00"
;
}
orderBean
.
setTeeTime
(
teetimeStr
);
model
.
put
(
"orderBean"
,
orderBean
);
model
.
put
(
"orderBean"
,
orderBean
);
model
.
put
(
"current"
,
current
);
model
.
put
(
"current"
,
current
);
model
.
put
(
"totalRefundAmount"
,
totalRefundAmount
);
model
.
put
(
"totalRefundAmount"
,
totalRefundAmount
);
...
@@ -292,6 +309,8 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
...
@@ -292,6 +309,8 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
processBean
.
setProcessDesc
(
""
);
processBean
.
setProcessDesc
(
""
);
processBean
.
setTeeTime
(
teeTime
);
processBean
.
setTeeTime
(
teeTime
);
processBean
.
setUcid
(
"123456"
);
processBean
.
setUcid
(
"123456"
);
//add by caosy
processBean
.
setProductId
(
orderBean
.
getProductId
());
processBean
.
setSendMsg
(
isMsg
==
1
?
true
:
false
);
processBean
.
setSendMsg
(
isMsg
==
1
?
true
:
false
);
processBean
.
setOperateType
(
OrderProcessEnum
.
CONFIRM_RESOURCE
.
getOperationCode
());
// 确认资源
processBean
.
setOperateType
(
OrderProcessEnum
.
CONFIRM_RESOURCE
.
getOperationCode
());
// 确认资源
opEventActivityOrderService
.
confirmEventActivityOrderResource
(
""
,
processBean
);
opEventActivityOrderService
.
confirmEventActivityOrderResource
(
""
,
processBean
);
...
@@ -302,6 +321,37 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
...
@@ -302,6 +321,37 @@ public class OpEventActivityOrderController extends AbstractOpOrderController<Ev
return
result
;
return
result
;
}
}
/**
* add by caosy: modify the teetime
* */
@RequestMapping
(
value
=
"/confirmEventActivityOrderResourceTeeTime"
,
method
=
RequestMethod
.
POST
)
public
String
confirmEventActivityOrderResourceTeeTime
(
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
=
"orderStatus"
)
String
orderStatus
,
@RequestParam
(
value
=
"formatTeeTime"
,
required
=
true
)
String
teeTime
,
ModelMap
map
)
{
String
result
=
null
;
OpEventActivityOrderBean
orderBean
=
opEventActivityOrderService
.
getDetail
(
""
,
orderId
);
result
=
"redirect:/eventActivityOrder/detail?orderId="
+
orderId
+
"¤t="
+
OrderUtil
.
getEventActivityListPageByStatus
(
orderStatus
);
if
(
orderBean
.
getOrderStatus
().
equals
(
orderStatus
))
{
EventActivityOrderProcessBean
processBean
=
new
EventActivityOrderProcessBean
();
processBean
.
setOperateTime
(
new
Date
());
processBean
.
setAni
(
"021-123"
);
processBean
.
setOperator
(
operator
);
processBean
.
setOrderId
(
orderId
);
processBean
.
setProcessDesc
(
""
);
processBean
.
setTeeTime
(
teeTime
);
processBean
.
setUcid
(
"123456"
);
//add by caosy
processBean
.
setProductId
(
orderBean
.
getProductId
());
processBean
.
setSendMsg
(
isMsg
==
1
?
true
:
false
);
processBean
.
setOperateType
(
OrderProcessEnum
.
CONFIRM_RESOURCE
.
getOperationCode
());
// 确认资源
opEventActivityOrderService
.
confirmEventActivityOrderResourceTeeTime
(
""
,
processBean
);
}
else
{
//map.put("changedStatus", OrderStatusEnum.getOrderStatusEnum(orderBean.getOrderStatus()).getShowStatusName());
//result = "redirect:/eventActivityOrder/orderList/" + OrderUtil.getEventActivityListPageByStatus(orderStatus) + "?changedStatus=" + orderBean.getOrderStatus();
}
return
result
;
}
@Override
@Override
public
String
cancelOrder
(
HttpServletRequest
request
,
String
eid
,
String
message
,
int
orderId
,
String
orderStatus
,
ModelMap
map
)
{
public
String
cancelOrder
(
HttpServletRequest
request
,
String
eid
,
String
message
,
int
orderId
,
String
orderStatus
,
ModelMap
map
)
{
...
...
src/main/java/com/ctrip/fun/admin/service/order/OpEventActivityOrderService.java
View file @
24788585
...
@@ -104,5 +104,18 @@ public class OpEventActivityOrderService extends AbstractOpOrderService<EventAct
...
@@ -104,5 +104,18 @@ public class OpEventActivityOrderService extends AbstractOpOrderService<EventAct
logger
.
error
(
String
.
format
(
"[确认资源] status: %d, msg: %s"
,
response
.
getStatus
(),
response
.
getMessage
()));
logger
.
error
(
String
.
format
(
"[确认资源] status: %d, msg: %s"
,
response
.
getStatus
(),
response
.
getMessage
()));
}
}
}
}
public
void
confirmEventActivityOrderResourceTeeTime
(
String
userId
,
EventActivityOrderProcessBean
processBean
)
{
String
uri
=
super
.
getServiceUri
(
"uri.eventActivityOrder.confirmEventActivityOrderResourceTeeTime"
);
Request
<
EventActivityOrderProcessBean
>
request
=
new
Request
<
EventActivityOrderProcessBean
>(
userId
,
processBean
);
HttpEntity
<
Request
<
EventActivityOrderProcessBean
>>
entity
=
new
HttpEntity
<
Request
<
EventActivityOrderProcessBean
>>(
request
);
Response
<
Integer
>
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
Integer
>>()
{
}).
getBody
();
if
(
response
.
getStatus
()
==
0
)
{
}
else
{
logger
.
error
(
String
.
format
(
"[确认资源] status: %d, msg: %s"
,
response
.
getStatus
(),
response
.
getMessage
()));
}
}
}
}
src/main/resources/properties/service.properties
View file @
24788585
# endpoint
# endpoint
uri.endpoint
=
${uri.endpoint}
uri.endpoint
=
${uri.endpoint}
#uri.endpoint=http\://
10.8.55.46\:8080
#uri.endpoint=http\://
localhost\:9999
#uri.endpoint=http\://service.golf.fun.ctripcorp.com
#uri.endpoint=http\://service.golf.fun.ctripcorp.com
...
@@ -65,6 +65,7 @@ uri.tourOrder.getTourOrderExralResource=/fun-golf-service/tourOrder/tourOrderExr
...
@@ -65,6 +65,7 @@ uri.tourOrder.getTourOrderExralResource=/fun-golf-service/tourOrder/tourOrderExr
# eventActivityOrder
# eventActivityOrder
uri.eventActivityOrder.changeCustomerInfo
=
/fun-golf-service/eventActivityOrder/changeCustomerInfo
uri.eventActivityOrder.changeCustomerInfo
=
/fun-golf-service/eventActivityOrder/changeCustomerInfo
uri.eventActivityOrder.confirmEventActivityOrderResource
=
/fun-golf-service/eventActivityOrder/confirmEventActivityOrderResource
uri.eventActivityOrder.confirmEventActivityOrderResource
=
/fun-golf-service/eventActivityOrder/confirmEventActivityOrderResource
uri.eventActivityOrder.confirmEventActivityOrderResourceTeeTime
=
/fun-golf-service/eventActivityOrder/confirmEventActivityOrderResourceTeeTime
#CoursePayee and CourseBalance
#CoursePayee and CourseBalance
uri.CoursePayee.list
=
/fun-golf-service/coursePayee/list
uri.CoursePayee.list
=
/fun-golf-service/coursePayee/list
...
...
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetailTeeTime.ftl
View file @
24788585
...
@@ -44,7 +44,13 @@
...
@@ -44,7 +44,13 @@
<td>底价</td><td>${orderBean.floorPrice!}</td>
<td>底价</td><td>${orderBean.floorPrice!}</td>
<td>确认时间</td>
<td>确认时间</td>
<td>
<td>
<input type="time" id="realpaytime" name="formatTeeTime" value="00:00" placeholder="TeeTime" class="input-medium">
<input type="time" id="realpaytime" name="formatTeeTime" value="${orderBean.teeTime}" placeholder="TeeTime" class="input-medium"
style="display:inline; width:50%;">
<form id="form" action = "/eventActivityOrder/confirmEventActivityOrderResourceTeeTime" method="post" style="display:none;" >
<#include "../common/orderPayInfoEdit.ftl">
</form>
<a href="javascript:;" onclick="submitEventActivityOrderWithMsg($(this))" class="btn btn-primary btn-small" style="display:inline; margin-left:10px;vertical-align:5px;">修改</a>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
...
src/main/webapp/WEB-INF/templates/eventActivityOrder/detail/orderDetailWithRefund.ftl
View file @
24788585
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<@com.layout title="订单详情" module="eventActivityOrder" current="${current}" pageJs=pageJsContent>
<@com.layout title="订单详情" module="eventActivityOrder" current="${current}" pageJs=pageJsContent>
<#include "../common/receiver.ftl">
<#include "../common/receiver.ftl">
<br>
<br>
<#include "../common/orderDetail.ftl">
<#include "../common/orderDetail
TeeTime
.ftl">
<#include "../common/contact.ftl">
<#include "../common/contact.ftl">
<div id="formContent" class = "div-formContent"></div>
<div id="formContent" class = "div-formContent"></div>
...
...
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