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
8d30faf9
authored
Oct 27, 2020
by
caosy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
小程序返回错误信息提示
parent
1d9e6b49
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderController.java
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
src/main/java/com/ctrip/fun/golf/api/order/CommuneOrderController.java
View file @
8d30faf9
...
...
@@ -45,6 +45,7 @@ public class CommuneOrderController extends AbstractOrderController<CommuneOrder
jSONObject
=
communeOrderService
.
placeOrderForMiniApp
(
request
.
getBody
());
response
.
setBody
(
jSONObject
);
}
catch
(
Exception
e
)
{
response
.
setMessage
(
e
.
getMessage
());
e
.
printStackTrace
();
}
return
response
;
...
...
@@ -70,11 +71,16 @@ public class CommuneOrderController extends AbstractOrderController<CommuneOrder
@SuppressWarnings
(
"unchecked"
)
@ResponseBody
@RequestMapping
(
value
=
"/voucherPlaceOrderForMiniApp"
,
method
=
RequestMethod
.
POST
)
public
ResponseMp
<
JSONObject
>
voucherPlaceOrderForMiniApp
(
@RequestBody
Request
<
CommuneOrderBean
>
request
)
throws
Exception
{
public
ResponseMp
<
JSONObject
>
voucherPlaceOrderForMiniApp
(
@RequestBody
Request
<
CommuneOrderBean
>
request
)
{
ResponseMp
<
JSONObject
>
response
=
new
ResponseMp
<
JSONObject
>();
JSONObject
jSONObject
;
try
{
jSONObject
=
communeOrderService
.
voucherPlaceOrderForMiniApp
(
request
.
getBody
());
response
.
setBody
(
jSONObject
);
}
catch
(
Exception
e
)
{
response
.
setMessage
(
e
.
getMessage
());
e
.
printStackTrace
();
}
return
response
;
}
...
...
src/main/java/com/ctrip/fun/golf/service/order/AbstractOrderService.java
View file @
8d30faf9
...
...
@@ -118,7 +118,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
public
abstract
PagedResponseBean
<?
extends
AbstractOrderListItemBean
>
queryOrderList
(
OrderQuery
orderQuery
);
public
Response
<
PlaceOrderResponseBean
>
rebook
(
H
abstractOrderBean
)
{
public
Response
<
PlaceOrderResponseBean
>
rebook
(
H
abstractOrderBean
)
throws
Exception
{
this
.
checkParameters
(
abstractOrderBean
);
...
...
@@ -230,7 +230,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
return
order
;
}
public
Response
<
PlaceOrderResponseBean
>
placeOrder
(
H
abstractOrderBean
)
{
public
Response
<
PlaceOrderResponseBean
>
placeOrder
(
H
abstractOrderBean
)
throws
Exception
{
this
.
checkParameters
(
abstractOrderBean
);
if
(
this
.
beforePlaceOrder
(
abstractOrderBean
))
{
this
.
adjustOrderPayAmount
(
abstractOrderBean
);
...
...
@@ -245,7 +245,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
return
null
;
}
public
Response
<
JSONObject
>
placeOrderWeiXinPay
(
H
abstractOrderBean
){
public
Response
<
JSONObject
>
placeOrderWeiXinPay
(
H
abstractOrderBean
)
throws
Exception
{
this
.
checkParameters
(
abstractOrderBean
);
if
(
this
.
beforePlaceOrder
(
abstractOrderBean
))
{
this
.
adjustOrderPayAmount
(
abstractOrderBean
);
...
...
@@ -681,8 +681,9 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
/**
* 检查传入参数
* @param abstractOrderBean
* @throws Exception
*/
protected
void
checkParameters
(
H
abstractOrderBean
)
{
protected
void
checkParameters
(
H
abstractOrderBean
)
throws
Exception
{
this
.
checkEventLimitUids
(
abstractOrderBean
);
if
(
null
==
abstractOrderBean
.
getResourceList
()
||
abstractOrderBean
.
getResourceList
().
size
()
==
0
)
{
...
...
src/main/java/com/ctrip/fun/golf/service/order/CommuneOrderService.java
View file @
8d30faf9
...
...
@@ -109,7 +109,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
// ==============================================
// ===================下订单逻辑====================
// ==============================================
protected
void
checkParameters
(
CommuneOrderBean
communeOrderBean
)
{
protected
void
checkParameters
(
CommuneOrderBean
communeOrderBean
)
throws
Exception
{
if
(
communeOrderBean
==
null
)
{
throw
new
OrderException
(-
1
,
"订单不存在"
);
}
...
...
@@ -292,7 +292,7 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
}
public
JSONObject
voucherPlaceOrderForMiniApp
(
CommuneOrderBean
communeOrderBean
)
throws
Exception
{
public
JSONObject
voucherPlaceOrderForMiniApp
(
CommuneOrderBean
communeOrderBean
)
throws
Exception
{
if
(
communeOrderBean
.
getAmount
().
compareTo
(
COMMUNE_AMOUNT
)==
0
||
communeOrderBean
.
getAmount
().
compareTo
(
COMMUNE_AMOUNT2
)==
0
){
return
placeOrderForMiniApp
(
communeOrderBean
);
}
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