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
64e1fde6
authored
Nov 13, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加了个人开票记录接口
parent
4b7acae5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
65 additions
and
7 deletions
src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderMController.java
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderMService.java
src/main/resources/rpc.properties
src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderMController.java
View file @
64e1fde6
...
@@ -28,12 +28,14 @@ import com.ctrip.fun.common.vo.Request;
...
@@ -28,12 +28,14 @@ import com.ctrip.fun.common.vo.Request;
import
com.ctrip.fun.common.vo.Response
;
import
com.ctrip.fun.common.vo.Response
;
import
com.ctrip.fun.common.vo.ResponseMp
;
import
com.ctrip.fun.common.vo.ResponseMp
;
import
com.ctrip.fun.common.vo.ResponseStatusEnum
;
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.basic.VoucherQueryRequestDTO
;
import
com.ctrip.fun.common.vo.order.BuyVoucherActivityBean
;
import
com.ctrip.fun.common.vo.order.BuyVoucherActivityBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderListItemBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderListItemBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderResourceBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderResourceBean
;
import
com.ctrip.fun.common.vo.order.InvoiceBean
;
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.OrderBean
;
import
com.ctrip.fun.common.vo.order.OrderListBean
;
import
com.ctrip.fun.common.vo.order.OrderListBean
;
import
com.ctrip.fun.common.vo.order.OrderQuery
;
import
com.ctrip.fun.common.vo.order.OrderQuery
;
...
@@ -86,9 +88,28 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
...
@@ -86,9 +88,28 @@ public class CommuneOrderMController extends AbstractOrderMController<CommuneOrd
@Security
@Security
@RequestMapping
(
value
=
"/addInvoice/{token}"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/addInvoice/{token}"
,
method
=
RequestMethod
.
POST
)
public
Response
<
Integer
>
addInvoice
(
@PathVariable
String
token
,
@RequestBody
InvoiceBean
invoiceBean
)
{
public
Response
<
Integer
>
addInvoice
(
@PathVariable
String
token
,
@RequestBody
InvoiceBean
invoiceBean
)
{
Request
<
InvoiceBean
>
request
=
new
Request
<
InvoiceBean
>();
invoiceBean
.
setUid
(
UserContext
.
getUserId
());
request
.
setBody
(
invoiceBean
);
Request
<
InvoiceBean
>
request
=
new
Request
<
InvoiceBean
>();
return
communeOrderMService
.
addInvoice
(
request
);
request
.
setBody
(
invoiceBean
);
return
communeOrderMService
.
addInvoice
(
request
);
}
@ResponseBody
@Security
@RequestMapping
(
value
=
"/listInvoice/{token}"
,
method
=
RequestMethod
.
GET
)
public
Response
<
PagedResponseBean
<
InvoiceBean
>>
invoiceRecord
(
@PathVariable
String
token
)
{
InvoiceinfoQuery
query
=
new
InvoiceinfoQuery
();
query
.
setUid
(
UserContext
.
getUserId
());
query
.
setSortField
(
"invoiceId"
);
query
.
setSortDirection
(
SortDirectionEnum
.
DESC
);
Request
<
InvoiceinfoQuery
>
request
=
new
Request
<
InvoiceinfoQuery
>();
request
.
setBody
(
query
);
PagedResponseBean
<
InvoiceBean
>
pageBean
=
communeOrderMService
.
listInvoice
(
UserContext
.
getUserId
(),
query
);
Response
<
PagedResponseBean
<
InvoiceBean
>>
resp
=
new
Response
<
PagedResponseBean
<
InvoiceBean
>>();
resp
.
setStatusEnum
(
ResponseStatusEnum
.
SUCCESS
);
resp
.
setBody
(
pageBean
);
return
resp
;
}
}
...
...
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderMService.java
View file @
64e1fde6
...
@@ -3,8 +3,13 @@
...
@@ -3,8 +3,13 @@
*/
*/
package
com
.
ctrip
.
fun
.
golf
.
service
.
order
;
package
com
.
ctrip
.
fun
.
golf
.
service
.
order
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.core.ParameterizedTypeReference
;
import
org.springframework.core.ParameterizedTypeReference
;
import
org.springframework.http.HttpEntity
;
import
org.springframework.http.HttpEntity
;
import
org.springframework.http.HttpMethod
;
import
org.springframework.http.HttpMethod
;
...
@@ -15,19 +20,20 @@ import com.ctrip.fun.common.vo.PagedResponseBean;
...
@@ -15,19 +20,20 @@ import com.ctrip.fun.common.vo.PagedResponseBean;
import
com.ctrip.fun.common.vo.Request
;
import
com.ctrip.fun.common.vo.Request
;
import
com.ctrip.fun.common.vo.Response
;
import
com.ctrip.fun.common.vo.Response
;
import
com.ctrip.fun.common.vo.ResponseMp
;
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.order.BuyVoucherActivityBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderListItemBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderListItemBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderResourceBean
;
import
com.ctrip.fun.common.vo.order.CommuneOrderResourceBean
;
import
com.ctrip.fun.common.vo.order.InvoiceBean
;
import
com.ctrip.fun.common.vo.order.InvoiceBean
;
import
com.ctrip.fun.common.vo.order.
OrderBean
;
import
com.ctrip.fun.common.vo.order.
InvoiceinfoQuery
;
import
com.ctrip.fun.common.vo.order.OrderListBean
;
import
com.ctrip.fun.common.vo.order.OrderListBean
;
import
com.ctrip.fun.common.vo.order.OrderQuery
;
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.common.vo.product.BuyVoucherActivityQuery
;
public
class
CommuneOrderMService
extends
AbstractOrderMService
<
CommuneOrderBean
,
CommuneOrderResourceBean
,
CommuneOrderListItemBean
>
{
public
class
CommuneOrderMService
extends
AbstractOrderMService
<
CommuneOrderBean
,
CommuneOrderResourceBean
,
CommuneOrderListItemBean
>
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
CommuneOrderMService
.
class
);
/**
/**
* @return
* @return
* @see com.ctrip.fun.golf.service.order.AbstractOrderMService#getOrderType()
* @see com.ctrip.fun.golf.service.order.AbstractOrderMService#getOrderType()
...
@@ -61,7 +67,7 @@ public class CommuneOrderMService extends AbstractOrderMService<CommuneOrderBean
...
@@ -61,7 +67,7 @@ public class CommuneOrderMService extends AbstractOrderMService<CommuneOrderBean
public
Response
<
Integer
>
addInvoice
(
@RequestBody
Request
<
InvoiceBean
>
request
)
{
public
Response
<
Integer
>
addInvoice
(
@RequestBody
Request
<
InvoiceBean
>
request
)
{
{
{
String
uri
=
super
.
getServiceUri
(
"uri.
order.addInvoice
"
);
String
uri
=
super
.
getServiceUri
(
"uri.
invoice.add
"
);
HttpEntity
<
Request
<
InvoiceBean
>>
entity
=
new
HttpEntity
<
Request
<
InvoiceBean
>>(
request
);
HttpEntity
<
Request
<
InvoiceBean
>>
entity
=
new
HttpEntity
<
Request
<
InvoiceBean
>>(
request
);
Response
<
Integer
>
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
Integer
>>()
{
Response
<
Integer
>
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
Integer
>>()
{
}).
getBody
();
}).
getBody
();
...
@@ -69,6 +75,36 @@ public class CommuneOrderMService extends AbstractOrderMService<CommuneOrderBean
...
@@ -69,6 +75,36 @@ public class CommuneOrderMService extends AbstractOrderMService<CommuneOrderBean
}
}
}
}
public
PagedResponseBean
<
InvoiceBean
>
listInvoice
(
String
userId
,
InvoiceinfoQuery
query
)
{
{
PagedResponseBean
<
InvoiceBean
>
responseBean
=
new
PagedResponseBean
<
InvoiceBean
>(
0
,
new
ArrayList
<
InvoiceBean
>());
Request
<
InvoiceinfoQuery
>
request
=
new
Request
<
InvoiceinfoQuery
>(
userId
,
query
);
String
uri
=
super
.
getServiceUri
(
"uri.invoice.list"
);
HttpEntity
<
Request
<
InvoiceinfoQuery
>>
entity
=
new
HttpEntity
<
Request
<
InvoiceinfoQuery
>>(
request
);
Response
<
PagedResponseBean
<
InvoiceBean
>>
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
entity
,
new
ParameterizedTypeReference
<
Response
<
PagedResponseBean
<
InvoiceBean
>>>()
{
}).
getBody
();
if
(
null
!=
response
)
{
if
(
response
.
getStatus
()
==
ResponseStatusEnum
.
SUCCESS
.
getValue
())
{
responseBean
=
response
.
getBody
();
}
else
{
Map
<
String
,
String
>
tags
=
new
HashMap
<>();
tags
.
put
(
"userId"
,
userId
);
tags
.
put
(
"query"
,
query
.
toString
());
logger
.
error
(
"list异常"
,
String
.
format
(
"status: %d, msg: %s"
,
response
.
getStatus
(),
response
.
getMessage
()),
tags
);
}
}
return
responseBean
;
}
}
public
ResponseMp
<
JSONObject
>
voucherPlaceOrderForMiniApp
(
@RequestBody
Request
<
CommuneOrderBean
>
request
)
{
public
ResponseMp
<
JSONObject
>
voucherPlaceOrderForMiniApp
(
@RequestBody
Request
<
CommuneOrderBean
>
request
)
{
...
...
src/main/resources/rpc.properties
View file @
64e1fde6
...
@@ -271,7 +271,8 @@ uri.UserInvoiceTitle.delete=/fun-golf-service/user/invoiceTitle/delete
...
@@ -271,7 +271,8 @@ uri.UserInvoiceTitle.delete=/fun-golf-service/user/invoiceTitle/delete
uri.UserInvoiceTitle.add
=
/fun-golf-service/user/invoiceTitle/add
uri.UserInvoiceTitle.add
=
/fun-golf-service/user/invoiceTitle/add
#
#
uri.order.addInvoice
=
/fun-golf-service/invoice/add
uri.invoice.add
=
/fun-golf-service/invoice/add
uri.invoice.list
=
/fun-golf-service/invoice/list
#weather
#weather
uri.weather.courseWeatherList
=
/fun-golf-service/courseWeather/courseWeatherList
uri.weather.courseWeatherList
=
/fun-golf-service/courseWeather/courseWeatherList
...
...
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