Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-golf-mobile
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
748d9e13
authored
Nov 23, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
买券活动后台配置功能
parent
2494c32f
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
65 additions
and
44 deletions
src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderMController.java
src/main/java/com/ctrip/fun/golf/service/basic/BuyVoucherActivityMService.java
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderMService.java
src/main/resources/rpc.properties
src/main/resources/voucher.spring.xml
src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderMController.java
View file @
748d9e13
...
...
@@ -2,18 +2,12 @@
* Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
*/
package
com
.
ctrip
.
fun
.
golf
.
api
.
order
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
javax.servlet.http.HttpServletRequest
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.web.bind.annotation.ModelAttribute
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -22,27 +16,24 @@ import org.springframework.web.bind.annotation.RequestParam;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
com.alibaba.fastjson.JSONObject
;
import
com.ctrip.fun.common.core.util.BeanConverter
;
import
com.ctrip.fun.common.vo.PagedResponseBean
;
import
com.ctrip.fun.common.vo.Request
;
import
com.ctrip.fun.common.vo.Response
;
import
com.ctrip.fun.common.vo.ResponseMp
;
import
com.ctrip.fun.common.vo.ResponseStatusEnum
;
import
com.ctrip.fun.common.vo.SortDirectionEnum
;
import
com.ctrip.fun.common.vo.basic.
VoucherQueryRequestDTO
;
import
com.ctrip.fun.common.vo.
order.BuyVoucherActivityBean
;
import
com.ctrip.fun.common.vo.basic.
BuyVoucherActivityBean
;
import
com.ctrip.fun.common.vo.
basic.BuyVoucherActivityQuery
;
import
com.ctrip.fun.common.vo.order.CommuneOrderBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderListItemBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderResourceBean
;
import
com.ctrip.fun.common.vo.order.InvoiceBean
;
import
com.ctrip.fun.common.vo.order.InvoiceinfoQuery
;
import
com.ctrip.fun.common.vo.order.OrderBean
;
import
com.ctrip.fun.common.vo.order.OrderListBean
;
import
com.ctrip.fun.common.vo.order.OrderQuery
;
import
com.ctrip.fun.common.vo.order.PlaceOrderResponseBean
;
import
com.ctrip.fun.common.vo.product.BuyVoucherActivityQuery
;
import
com.ctrip.fun.golf.secrity.Security
;
import
com.ctrip.fun.golf.secrity.UserContext
;
import
com.ctrip.fun.golf.service.basic.BuyVoucherActivityMService
;
import
com.ctrip.fun.golf.service.order.AbstractOrderMService
;
import
com.ctrip.fun.golf.service.order.CommuneOrderMService
;
...
...
@@ -53,9 +44,9 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
@Autowired
private
CommuneOrderMService
communeOrderMService
=
null
;
@Autowired
private
BuyVoucherActivityMService
buyVoucherActivityMService
=
null
;
@SuppressWarnings
(
"unchecked"
)
@ResponseBody
@Security
(
index
=
1
,
field
=
"token"
)
@RequestMapping
(
value
=
"/ordersForMiniApps"
,
method
=
RequestMethod
.
POST
)
...
...
@@ -127,27 +118,28 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
return
response
;
}
@SuppressWarnings
(
"unchecked"
)
@ResponseBody
@RequestMapping
(
value
=
"/buyVoucherActivityList"
,
method
=
RequestMethod
.
GET
)
public
Object
buyVoucherActivityList
()
{
Response
<
List
<
BuyVoucherActivityBean
>>
response
=
new
Response
<
List
<
BuyVoucherActivityBean
>>();
Request
<
BuyVoucherActivityQuery
>
request
=
new
Request
<
BuyVoucherActivityQuery
>();
request
.
setBody
(
new
BuyVoucherActivityQuery
());
response
.
setBody
(
communeOrderMService
.
buyVoucherActivityList
(
request
).
getBody
());
BuyVoucherActivityQuery
query
=
new
BuyVoucherActivityQuery
();
query
.
setValid
(
1
);
request
.
setBody
(
query
);
Response
<
PagedResponseBean
<
BuyVoucherActivityBean
>>
responsePage
=
buyVoucherActivityMService
.
list
(
request
);
response
.
setBody
((
ArrayList
<
BuyVoucherActivityBean
>)
responsePage
.
getBody
().
getResult
());
response
.
setStatus
(
ResponseStatusEnum
.
SUCCESS
.
getValue
());
response
.
setMessage
(
"success"
);
return
response
;
}
@SuppressWarnings
(
"unchecked"
)
@ResponseBody
@RequestMapping
(
value
=
"/getBuyVoucherActivityDetail"
,
method
=
RequestMethod
.
GET
)
public
Object
getBuyVoucherActivityDetail
(
Integer
id
)
{
Response
<
BuyVoucherActivityBean
>
response
=
new
Response
<
BuyVoucherActivityBean
>();
Request
<
Integer
>
request
=
new
Request
<
Integer
>();
request
.
setBody
(
id
);
response
.
setBody
(
communeOrderMService
.
getBuyVoucherActivityDetail
(
request
).
getBody
());
response
.
setBody
(
buyVoucherActivityMService
.
get
(
request
).
getBody
());
response
.
setStatus
(
ResponseStatusEnum
.
SUCCESS
.
getValue
());
response
.
setMessage
(
"success"
);
return
response
;
...
...
src/main/java/com/ctrip/fun/golf/service/basic/BuyVoucherActivityMService.java
0 → 100644
View file @
748d9e13
package
com
.
ctrip
.
fun
.
golf
.
service
.
basic
;
import
java.util.List
;
import
org.springframework.core.ParameterizedTypeReference
;
import
org.springframework.http.HttpEntity
;
import
org.springframework.http.HttpMethod
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
com.ctrip.fun.common.vo.PagedResponseBean
;
import
com.ctrip.fun.common.vo.Request
;
import
com.ctrip.fun.common.vo.Response
;
import
com.ctrip.fun.common.vo.ResponseMp
;
import
com.ctrip.fun.common.vo.basic.BuyVoucherActivityBean
;
import
com.ctrip.fun.common.vo.basic.BuyVoucherActivityQuery
;
import
com.ctrip.fun.golf.service.BaseService
;
/*
* @author humt
*/
public
class
BuyVoucherActivityMService
extends
BaseService
{
public
Response
<
PagedResponseBean
<
BuyVoucherActivityBean
>>
list
(
@RequestBody
Request
<
BuyVoucherActivityQuery
>
request
)
{
{
String
uri
=
super
.
getServiceUri
(
"uri.buyVoucherActivity.list"
);
HttpEntity
<
Request
<
BuyVoucherActivityQuery
>>
entity
=
new
HttpEntity
<
Request
<
BuyVoucherActivityQuery
>>(
request
);
Response
<
PagedResponseBean
<
BuyVoucherActivityBean
>>
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
PagedResponseBean
<
BuyVoucherActivityBean
>>>()
{
}).
getBody
();
return
response
;
}
}
public
Response
<
BuyVoucherActivityBean
>
get
(
@RequestBody
Request
<
Integer
>
request
)
{
{
String
uri
=
super
.
getServiceUri
(
"uri.buyVoucherActivity.get"
);
HttpEntity
<
Request
<
Integer
>>
entity
=
new
HttpEntity
<
Request
<
Integer
>>(
request
);
Response
<
BuyVoucherActivityBean
>
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
ResponseMp
<
BuyVoucherActivityBean
>>()
{
}).
getBody
();
return
response
;
}
}
}
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderMService.java
View file @
748d9e13
...
...
@@ -21,7 +21,8 @@ import com.ctrip.fun.common.vo.Request;
import
com.ctrip.fun.common.vo.Response
;
import
com.ctrip.fun.common.vo.ResponseMp
;
import
com.ctrip.fun.common.vo.ResponseStatusEnum
;
import
com.ctrip.fun.common.vo.order.BuyVoucherActivityBean
;
import
com.ctrip.fun.common.vo.basic.BuyVoucherActivityBean
;
import
com.ctrip.fun.common.vo.basic.BuyVoucherActivityQuery
;
import
com.ctrip.fun.common.vo.order.CommuneOrderBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderListItemBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderResourceBean
;
...
...
@@ -29,7 +30,7 @@ import com.ctrip.fun.common.vo.order.InvoiceBean;
import
com.ctrip.fun.common.vo.order.InvoiceinfoQuery
;
import
com.ctrip.fun.common.vo.order.OrderListBean
;
import
com.ctrip.fun.common.vo.order.OrderQuery
;
import
com.ctrip.fun.common.vo.product.BuyVoucherActivityQuery
;
public
class
CommuneOrderMService
extends
AbstractOrderMService
<
CommuneOrderBean
,
CommuneOrderResourceBean
,
CommuneOrderListItemBean
>
{
...
...
@@ -119,27 +120,6 @@ public class CommuneOrderMService extends AbstractOrderMService<CommuneOrderBean
}
public
Response
<
List
<
BuyVoucherActivityBean
>>
buyVoucherActivityList
(
@RequestBody
Request
<
BuyVoucherActivityQuery
>
request
)
{
{
String
uri
=
super
.
getServiceUri
(
"uri.communeOrder.buyVoucherActivityList"
);
HttpEntity
<
Request
<
BuyVoucherActivityQuery
>>
entity
=
new
HttpEntity
<
Request
<
BuyVoucherActivityQuery
>>(
request
);
Response
<
List
<
BuyVoucherActivityBean
>>
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
List
<
BuyVoucherActivityBean
>>>()
{
}).
getBody
();
return
response
;
}
}
public
Response
<
BuyVoucherActivityBean
>
getBuyVoucherActivityDetail
(
@RequestBody
Request
<
Integer
>
request
)
{
{
String
uri
=
super
.
getServiceUri
(
"uri.communeOrder.getBuyVoucherActivityDetail"
);
HttpEntity
<
Request
<
Integer
>>
entity
=
new
HttpEntity
<
Request
<
Integer
>>(
request
);
Response
<
BuyVoucherActivityBean
>
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
ResponseMp
<
BuyVoucherActivityBean
>>()
{
}).
getBody
();
return
response
;
}
}
public
Response
<
String
>
getBuyVoucherActivityMessage
(
@RequestBody
Request
<
String
>
request
)
{
{
...
...
src/main/resources/rpc.properties
View file @
748d9e13
...
...
@@ -55,8 +55,10 @@ uri.order.deleteOrder=/fun-golf-service/{orderType}/deleteOrder
uri.communeOrder.queryCanInvoiceOrder
=
/fun-golf-service/communeOrder/queryCanInvoiceOrder
uri.communeOrder.placeOrderForMiniApp
=
/fun-golf-service/communeOrder/placeOrderForMiniApp
uri.communeOrder.voucherPlaceOrderForMiniApp
=
/fun-golf-service/communeOrder/voucherPlaceOrderForMiniApp
uri.communeOrder.buyVoucherActivityList
=
/fun-golf-service/communeOrder/buyVoucherActivityList
uri.communeOrder.getBuyVoucherActivityDetail
=
/fun-golf-service/communeOrder/getBuyVoucherActivityDetail
#buyVoucherActivity
uri.buyVoucherActivity.list
=
/fun-golf-service/buyVoucherActivity/list
uri.buyVoucherActivity.get
=
/fun-golf-service/buyVoucherActivity/get
uri.communeOrder.getBuyVoucherActivityMessage
=
/fun-golf-service/communeOrder/getBuyVoucherActivityMessage
# order0
...
...
src/main/resources/voucher.spring.xml
View file @
748d9e13
...
...
@@ -3,4 +3,6 @@
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd"
>
<bean
name=
"voucherService"
class=
"com.ctrip.fun.golf.service.basic.VoucherMService"
parent=
"baseService"
/>
<bean
name=
"buyVoucherActivityMService"
class=
"com.ctrip.fun.golf.service.basic.BuyVoucherActivityMService"
parent=
"baseService"
/>
</beans>
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