Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-service
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
1
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
8770b844
authored
Nov 15, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
赛事订单, 导出增加 下单渠道字段
parent
8e935a5a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
0 deletions
src/main/java/com/ctrip/fun/golf/dao/order/EventActivityOrderExcelDao.java
src/main/java/com/ctrip/fun/golf/domain/order/EventActivityOrderListExcel.java
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
src/main/java/com/ctrip/fun/golf/dao/order/EventActivityOrderExcelDao.java
View file @
8770b844
...
...
@@ -62,6 +62,7 @@ public class EventActivityOrderExcelDao extends GenericHibernateDao<EventActivit
+
",orderitem.communeGuestMinus"
+
",orderitem.floorPrice"
+
",od.remark"
+
",od.platform"
+
",od.onlineOrderFlag"
+
",(SELECT ord_payinfo.prePayAmount FROM ord_payinfo WHERE ord_payinfo.OrderID = od.OrderID ORDER BY ord_payinfo.id LIMIT 0,1) as depositAmount"
+
",orderitem.quantity as quantity"
...
...
src/main/java/com/ctrip/fun/golf/domain/order/EventActivityOrderListExcel.java
View file @
8770b844
...
...
@@ -122,6 +122,8 @@ public class EventActivityOrderListExcel {
/** The play date. */
private
Date
playDate
;
private
String
platform
;
public
String
getUid
()
{
return
uid
;
...
...
@@ -369,4 +371,12 @@ public class EventActivityOrderListExcel {
this
.
prePayCardRefundAmount
=
prePayCardRefundAmount
;
}
public
String
getPlatform
()
{
return
platform
;
}
public
void
setPlatform
(
String
platform
)
{
this
.
platform
=
platform
;
}
}
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
View file @
8770b844
...
...
@@ -937,6 +937,7 @@ public class OpEventActivityOrderService
bean
.
setContactTel
(
xsl
.
getContactTel
());
bean
.
setOrderDate
(
xsl
.
getOrderDate
());
bean
.
setPlayDate
(
xsl
.
getPlayDate
());
bean
.
setPlatform
(
xsl
.
getPlatform
());
if
(
xsl
.
getOnlineOrderFlag
()
!=
null
&&
!
xsl
.
getOnlineOrderFlag
())
{
bean
.
setOrderSourceCategory
(
"线下订单"
);
}
else
{
...
...
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