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
e8187b10
Commit
e8187b10
authored
Nov 15, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
老接口不再使用,废弃
parent
43396f46
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
53 deletions
+47
-53
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
+2
-8
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+44
-44
No files found.
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
View file @
e8187b10
...
@@ -63,19 +63,13 @@ public class OrderController {
...
@@ -63,19 +63,13 @@ public class OrderController {
private
PointsMallOrderService
pointsMallOrderService
;
private
PointsMallOrderService
pointsMallOrderService
;
/**
/**
* 废弃,不在使用
* 创建订单之前校验前面排队的订单数
* 创建订单之前校验前面排队的订单数
*/
*/
@ApiAnnotation
(
logMessage
=
"checkBeforeCreateOrder"
)
@ApiAnnotation
(
logMessage
=
"checkBeforeCreateOrder"
)
@PostMapping
(
"/checkBeforeCreateOrder"
)
@PostMapping
(
"/checkBeforeCreateOrder"
)
public
BaseResponse
checkBeforeCreateOrder
(
@Validated
@LogParams
@RequestBody
CheckBeforeCreateOrderRequestVo
checkBeforeCreateOrderRequestVo
)
{
public
BaseResponse
checkBeforeCreateOrder
(
@Validated
@LogParams
@RequestBody
CheckBeforeCreateOrderRequestVo
checkBeforeCreateOrderRequestVo
)
{
long
start
=
System
.
currentTimeMillis
();
return
ResponseUtil
.
success
();
BaseResponse
result
=
null
;
try
{
result
=
orderservice
.
checkBeforeCreateOrder
(
checkBeforeCreateOrderRequestVo
);
}
catch
(
Exception
e
)
{
HealthUtil
.
logHealthInfo
(
"checkBeforeCreateOrder"
,
(
System
.
currentTimeMillis
()
-
start
),
e
.
getMessage
());
}
return
result
;
}
}
/**
/**
...
...
order-application-service/src/main/java/cn/freemud/service/Orderservice.java
View file @
e8187b10
...
@@ -22,7 +22,7 @@ public interface Orderservice extends OrderFactoryService{
...
@@ -22,7 +22,7 @@ public interface Orderservice extends OrderFactoryService{
/**
/**
* 创建订单之前校验前面排队的订单数
* 创建订单之前校验前面排队的订单数
*/
*/
BaseResponse
checkBeforeCreateOrder
(
CheckBeforeCreateOrderRequestVo
checkBeforeCreateOrderRequestVo
);
//
BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo checkBeforeCreateOrderRequestVo);
/**
/**
* 创建订单
* 创建订单
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
e8187b10
...
@@ -263,50 +263,50 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -263,50 +263,50 @@ public class OrderServiceImpl implements Orderservice {
private
MicroOpenplatformClient
microOpenplatformClient
;
private
MicroOpenplatformClient
microOpenplatformClient
;
@Override
//
@Override
public
BaseResponse
checkBeforeCreateOrder
(
CheckBeforeCreateOrderRequestVo
requestVo
)
{
//
public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
String
trackingNo
=
LogThreadLocal
.
getTrackingNo
();
//
String trackingNo = LogThreadLocal.getTrackingNo();
AssortmentCustomerInfoVo
userInfo
=
customerInfoManager
.
getCustomerInfoByObject
(
requestVo
.
getSessionId
());
//
AssortmentCustomerInfoVo userInfo = customerInfoManager.getCustomerInfoByObject(requestVo.getSessionId());
if
(
userInfo
==
null
||
StringUtils
.
isEmpty
(
userInfo
.
getMemberId
()))
{
//
if (userInfo == null || StringUtils.isEmpty(userInfo.getMemberId())) {
return
ResponseUtil
.
error
(
ResponseResult
.
NOT_LOGIN
);
//
return ResponseUtil.error(ResponseResult.NOT_LOGIN);
}
//
}
StoreResponse
storeResponse
=
checkOrder
.
getStoreInfo
(
requestVo
.
getPartnerId
(),
requestVo
.
getShopId
(),
trackingNo
);
//
StoreResponse storeResponse = checkOrder.getStoreInfo(requestVo.getPartnerId(), requestVo.getShopId(), trackingNo);
if
(
storeResponse
==
null
||
storeResponse
.
getBizVO
()
==
null
)
{
//
if (storeResponse == null || storeResponse.getBizVO() == null) {
return
ResponseUtil
.
error
(
ResponseResult
.
STORE_NOT_FOUND
);
//
return ResponseUtil.error(ResponseResult.STORE_NOT_FOUND);
}
//
}
StoreResponse
.
BizVO
storeInfo
=
storeResponse
.
getBizVO
();
//
StoreResponse.BizVO storeInfo = storeResponse.getBizVO();
CheckBeforeCreateOrderResponseVo
responseVo
=
new
CheckBeforeCreateOrderResponseVo
();
//
CheckBeforeCreateOrderResponseVo responseVo = new CheckBeforeCreateOrderResponseVo();
Integer
maxOrderQuantity
=
storeInfo
.
getMaxOrderQuantity
();
//
Integer maxOrderQuantity = storeInfo.getMaxOrderQuantity();
if
(
maxOrderQuantity
==
null
)
{
//
if (maxOrderQuantity == null) {
maxOrderQuantity
=
100
;
//
maxOrderQuantity = 100;
}
//
}
// 调用文顺接口获取队列长度
//
// 调用文顺接口获取队列长度
BaseQueryOrderRequest
baseQueryOrderRequest
=
new
BaseQueryOrderRequest
();
//
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest
.
setPartnerId
(
requestVo
.
getPartnerId
());
//
baseQueryOrderRequest.setPartnerId(requestVo.getPartnerId());
baseQueryOrderRequest
.
setShopId
(
requestVo
.
getShopId
());
//
baseQueryOrderRequest.setShopId(requestVo.getShopId());
baseQueryOrderRequest
.
setTrackingNo
(
trackingNo
);
//
baseQueryOrderRequest.setTrackingNo(trackingNo);
BaseOrderResponse
queryStoreOrderQuantity
=
orderCenterSdkService
.
queryStoreOrderQuantity
(
baseQueryOrderRequest
);
//
BaseOrderResponse queryStoreOrderQuantity = orderCenterSdkService.queryStoreOrderQuantity(baseQueryOrderRequest);
QueryStoreOrderQuantityResponseDto
responseDto
=
new
QueryStoreOrderQuantityResponseDto
();
//
QueryStoreOrderQuantityResponseDto responseDto = new QueryStoreOrderQuantityResponseDto();
BeanUtil
.
convertBean
(
queryStoreOrderQuantity
,
responseDto
);
//
BeanUtil.convertBean(queryStoreOrderQuantity, responseDto);
//
if
(!
RESPONSE_SUCCESS_CODE
.
equals
(
responseDto
.
getErrcode
()))
{
//
if (!RESPONSE_SUCCESS_CODE.equals(responseDto.getErrcode())) {
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_QUERY_QUANTITYR_ERROR
);
//
return ResponseUtil.error(ResponseResult.ORDER_QUERY_QUANTITYR_ERROR);
}
//
}
Integer
lineNumber
=
Integer
.
parseInt
(
responseDto
.
getData
());
//
Integer lineNumber = Integer.parseInt(responseDto.getData());
// 判断最大接单量和队列长度的关系
//
// 判断最大接单量和队列长度的关系
if
(
maxOrderQuantity
>
lineNumber
)
{
//
if (maxOrderQuantity > lineNumber) {
responseVo
.
setWhetherMaxOrderQuantity
(
false
);
//
responseVo.setWhetherMaxOrderQuantity(false);
responseVo
.
setBeforeNumber
(
lineNumber
);
//
responseVo.setBeforeNumber(lineNumber);
responseVo
.
setWarningInfo
(
""
);
//
responseVo.setWarningInfo("");
}
else
{
//
} else {
responseVo
.
setWhetherMaxOrderQuantity
(
true
);
//
responseVo.setWhetherMaxOrderQuantity(true);
String
beforeMessage
=
"您前面排队超过"
;
//
String beforeMessage = "您前面排队超过";
String
afterMessage
=
"单,出餐时间稍长,是否继续提交?"
;
//
String afterMessage = "单,出餐时间稍长,是否继续提交?";
responseVo
.
setBeforeNumber
(
lineNumber
);
//
responseVo.setBeforeNumber(lineNumber);
responseVo
.
setWarningInfo
(
beforeMessage
+
lineNumber
+
afterMessage
);
//
responseVo.setWarningInfo(beforeMessage + lineNumber + afterMessage);
}
//
}
return
ResponseUtil
.
success
(
responseVo
);
//
return ResponseUtil.success(responseVo);
}
//
}
// 原来saas
// 原来saas
@Override
@Override
...
...
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