Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
b879b279
Commit
b879b279
authored
Aug 06, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
500状态码处理
parent
1b93a61a
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
12 deletions
+11
-12
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+2
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
+2
-2
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+3
-3
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
+0
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
b879b279
...
@@ -2616,7 +2616,7 @@ public class OrderSdkAdapter {
...
@@ -2616,7 +2616,7 @@ public class OrderSdkAdapter {
public
BaseOrderResponse
convent2NewOrderUpdateThirdOrderCode
(
BaseResponse
updateThirdOrderCode
)
{
public
BaseOrderResponse
convent2NewOrderUpdateThirdOrderCode
(
BaseResponse
updateThirdOrderCode
)
{
BaseOrderResponse
baseOrderResponse
=
new
BaseOrderResponse
();
BaseOrderResponse
baseOrderResponse
=
new
BaseOrderResponse
();
baseOrderResponse
.
setErrcode
(
updateThirdOrderCode
.
getCode
()
!=
null
?
Integer
.
parseInt
(
updateThirdOrderCode
.
getCode
())
:
50
0
);
baseOrderResponse
.
setErrcode
(
updateThirdOrderCode
.
getCode
()
!=
null
?
Integer
.
parseInt
(
updateThirdOrderCode
.
getCode
())
:
50
1
);
baseOrderResponse
.
setErrmsg
(
updateThirdOrderCode
.
getMessage
());
baseOrderResponse
.
setErrmsg
(
updateThirdOrderCode
.
getMessage
());
return
baseOrderResponse
;
return
baseOrderResponse
;
...
@@ -2624,7 +2624,7 @@ public class OrderSdkAdapter {
...
@@ -2624,7 +2624,7 @@ public class OrderSdkAdapter {
public
BaseOrderResponse
convent2UpdatePickUpGoodNo
(
BaseResponse
baseResponse
)
{
public
BaseOrderResponse
convent2UpdatePickUpGoodNo
(
BaseResponse
baseResponse
)
{
BaseOrderResponse
baseOrderResponse
=
new
BaseOrderResponse
();
BaseOrderResponse
baseOrderResponse
=
new
BaseOrderResponse
();
baseOrderResponse
.
setErrcode
(
baseResponse
.
getCode
()
!=
null
?
Integer
.
parseInt
(
baseResponse
.
getCode
())
:
50
0
);
baseOrderResponse
.
setErrcode
(
baseResponse
.
getCode
()
!=
null
?
Integer
.
parseInt
(
baseResponse
.
getCode
())
:
50
1
);
baseOrderResponse
.
setErrmsg
(
baseResponse
.
getMessage
());
baseOrderResponse
.
setErrmsg
(
baseResponse
.
getMessage
());
return
baseOrderResponse
;
return
baseOrderResponse
;
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
View file @
b879b279
...
@@ -162,7 +162,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -162,7 +162,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
CreateFatherSonOrderResponse
createFatherSonOrderResponse
=
orderSdkAdapter
.
convent2NEWFatherOrderInfoReqs
(
baseResponse
);
CreateFatherSonOrderResponse
createFatherSonOrderResponse
=
orderSdkAdapter
.
convent2NEWFatherOrderInfoReqs
(
baseResponse
);
List
<
QueryOrdersResponse
.
DataBean
.
OrderBean
>
productOrderInfo
=
createFatherSonOrderResponse
.
getOrderBeanList
().
stream
().
filter
(
orderBeanTemp
->
1
==
orderBeanTemp
.
getBizType
()).
collect
(
Collectors
.
toList
());
List
<
QueryOrdersResponse
.
DataBean
.
OrderBean
>
productOrderInfo
=
createFatherSonOrderResponse
.
getOrderBeanList
().
stream
().
filter
(
orderBeanTemp
->
1
==
orderBeanTemp
.
getBizType
()).
collect
(
Collectors
.
toList
());
if
(
CollectionUtils
.
isEmpty
(
productOrderInfo
))
{
if
(
CollectionUtils
.
isEmpty
(
productOrderInfo
))
{
return
CreateFatherSonOrderResponse
.
error
(
"50
0
"
,
""
);
return
CreateFatherSonOrderResponse
.
error
(
"50
1
"
,
""
);
}
}
CreateFatherSonOrderRequest
.
OrderInfo
productOrderRequest
=
createFatherSonOrderRequest
.
getOrderInfoList
().
stream
().
filter
(
orderBeanTemp
->
1
==
orderBeanTemp
.
getBizType
()).
collect
(
Collectors
.
toList
()).
get
(
0
);
CreateFatherSonOrderRequest
.
OrderInfo
productOrderRequest
=
createFatherSonOrderRequest
.
getOrderInfoList
().
stream
().
filter
(
orderBeanTemp
->
1
==
orderBeanTemp
.
getBizType
()).
collect
(
Collectors
.
toList
()).
get
(
0
);
BaseOrderResponse
baseOrderResponse
=
updateStockAndScore
(
productOrderInfo
.
get
(
0
),
productOrderRequest
.
getProducts
(),
productOrderRequest
.
getActivityUpdateStockRequest
(),
productOrderRequest
.
getAccounts
(),
BaseOrderResponse
baseOrderResponse
=
updateStockAndScore
(
productOrderInfo
.
get
(
0
),
productOrderRequest
.
getProducts
(),
productOrderRequest
.
getActivityUpdateStockRequest
(),
productOrderRequest
.
getAccounts
(),
...
@@ -1307,7 +1307,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
...
@@ -1307,7 +1307,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
dataBean
.
setOrders
(
orderBeanList
);
dataBean
.
setOrders
(
orderBeanList
);
}
}
response
.
setData
(
dataBean
);
response
.
setData
(
dataBean
);
response
.
setErrcode
(
baseResponse
.
getCode
()
!=
null
?
Integer
.
parseInt
(
baseResponse
.
getCode
())
:
50
0
);
response
.
setErrcode
(
baseResponse
.
getCode
()
!=
null
?
Integer
.
parseInt
(
baseResponse
.
getCode
())
:
50
1
);
response
.
setErrmsg
(
baseResponse
.
getMessage
());
response
.
setErrmsg
(
baseResponse
.
getMessage
());
return
response
;
return
response
;
}
}
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
b879b279
...
@@ -3899,7 +3899,7 @@ public class OrderAdapter {
...
@@ -3899,7 +3899,7 @@ public class OrderAdapter {
*/
*/
public
String
newSendPayFailedMessage
()
{
public
String
newSendPayFailedMessage
()
{
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
map
.
put
(
"code"
,
500
);
map
.
put
(
"code"
,
102
);
map
.
put
(
"message"
,
"failed"
);
map
.
put
(
"message"
,
"failed"
);
return
gson
.
toJson
(
map
);
return
gson
.
toJson
(
map
);
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
b879b279
...
@@ -303,7 +303,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -303,7 +303,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
// 新版支付成功的情况下code为100
// 新版支付成功的情况下code为100
return
newSendPaySuccessNoticeMessage
();
return
newSendPaySuccessNoticeMessage
();
}
else
{
}
else
{
return
newSendPayFaileMessage
()
;
return
res
;
}
}
}
}
return
newSendPayFaileMessage
();
return
newSendPayFaileMessage
();
...
@@ -366,7 +366,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -366,7 +366,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
*/
*/
public
String
newSendPayFaileMessage
()
{
public
String
newSendPayFaileMessage
()
{
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
map
.
put
(
"code"
,
500
);
map
.
put
(
"code"
,
102
);
map
.
put
(
"message"
,
"failed"
);
map
.
put
(
"message"
,
"failed"
);
return
gson
.
toJson
(
map
);
return
gson
.
toJson
(
map
);
}
}
...
@@ -1834,7 +1834,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -1834,7 +1834,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
*/
*/
public
String
refundFailedMessage
(
String
errorMes
)
{
public
String
refundFailedMessage
(
String
errorMes
)
{
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
map
.
put
(
"code"
,
500
);
map
.
put
(
"code"
,
102
);
map
.
put
(
"message"
,
"failed:"
+
errorMes
);
map
.
put
(
"message"
,
"failed:"
+
errorMes
);
return
gson
.
toJson
(
map
);
return
gson
.
toJson
(
map
);
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
View file @
b879b279
...
@@ -989,7 +989,7 @@ public class MallOrderServiceImpl implements MallOrderService {
...
@@ -989,7 +989,7 @@ public class MallOrderServiceImpl implements MallOrderService {
*/
*/
public
String
refundFaileMessage
(
String
errorMes
)
{
public
String
refundFaileMessage
(
String
errorMes
)
{
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
map
.
put
(
"code"
,
500
);
map
.
put
(
"code"
,
102
);
map
.
put
(
"message"
,
"failed:"
+
errorMes
);
map
.
put
(
"message"
,
"failed:"
+
errorMes
);
return
gson
.
toJson
(
map
);
return
gson
.
toJson
(
map
);
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
View file @
b879b279
...
@@ -209,7 +209,7 @@ public class OrderCommonService {
...
@@ -209,7 +209,7 @@ public class OrderCommonService {
*/
*/
public
String
newSendPayFaileMessage
()
{
public
String
newSendPayFaileMessage
()
{
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
map
.
put
(
"code"
,
500
);
map
.
put
(
"code"
,
102
);
map
.
put
(
"message"
,
"failed"
);
map
.
put
(
"message"
,
"failed"
);
return
JSON
.
toJSONString
(
map
);
return
JSON
.
toJSONString
(
map
);
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
b879b279
...
@@ -2285,7 +2285,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2285,7 +2285,7 @@ public class OrderServiceImpl implements Orderservice {
*/
*/
public
String
refundFaileMessage
(
String
errorMes
)
{
public
String
refundFaileMessage
(
String
errorMes
)
{
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
Map
<
String
,
Object
>
map
=
Maps
.
newTreeMap
();
map
.
put
(
"code"
,
500
);
map
.
put
(
"code"
,
102
);
map
.
put
(
"message"
,
"failed:"
+
errorMes
);
map
.
put
(
"message"
,
"failed:"
+
errorMes
);
return
gson
.
toJson
(
map
);
return
gson
.
toJson
(
map
);
}
}
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
View file @
b879b279
...
@@ -163,7 +163,6 @@ public class CalculationServiceImpl {
...
@@ -163,7 +163,6 @@ public class CalculationServiceImpl {
// try {
// try {
activityCalculationDiscountResponseDto
=
activityClient
.
calculationDiscountSharing
(
discountRequest
);
activityCalculationDiscountResponseDto
=
activityClient
.
calculationDiscountSharing
(
discountRequest
);
// } catch (Exception ex) {
// } catch (Exception ex) {
// ErrorLog.errorDev("500", "/calculation/discount/sharing_error", ex, discountRequest);
// throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
// throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
// }
// }
//优惠券互斥
//优惠券互斥
...
...
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