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
eb50901b
Commit
eb50901b
authored
Nov 16, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
从缓存获取用户信息只获取一次
parent
31b75630
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
18 deletions
+16
-18
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
+1
-2
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+5
-8
order-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java
+7
-3
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+3
-5
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
View file @
eb50901b
...
@@ -117,8 +117,7 @@ public class AppOrderServiceImpl implements AppOrderService {
...
@@ -117,8 +117,7 @@ public class AppOrderServiceImpl implements AppOrderService {
String
trackingNo
=
LogThreadLocal
.
getTrackingNo
();
String
trackingNo
=
LogThreadLocal
.
getTrackingNo
();
CreateOrderVo
createOrderVo
=
createOrderBO
.
getCreateOrderVo
();
CreateOrderVo
createOrderVo
=
createOrderBO
.
getCreateOrderVo
();
// 查询用户信息
// 查询用户信息
AssortmentCustomerInfoVo
userLoginInfoDto
=
checkOrder
.
checkOrderByMember
(
createOrderVo
);
AssortmentCustomerInfoVo
userLoginInfoDto
=
checkOrder
.
checkOrderByMember
(
createOrderBO
);
createOrderBO
.
setUserLoginInfoDto
(
userLoginInfoDto
);
// 查询门店信息 营业时间、营业状态,服务器当前时间在营业时间内 点餐桌号
// 查询门店信息 营业时间、营业状态,服务器当前时间在营业时间内 点餐桌号
StoreResponseDto
storeResponseDto
=
checkOrder
.
checkOrderByStore
(
createOrderBO
).
getStoreInfo
();
StoreResponseDto
storeResponseDto
=
checkOrder
.
checkOrderByStore
(
createOrderBO
).
getStoreInfo
();
// 查询购物车(内部校验券点餐方式,券是否可用) 校验当前订单类型的下单参数
// 查询购物车(内部校验券点餐方式,券是否可用) 校验当前订单类型的下单参数
...
...
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
eb50901b
...
@@ -128,7 +128,7 @@ public class CheckOrder {
...
@@ -128,7 +128,7 @@ public class CheckOrder {
return
baseResponse
;
return
baseResponse
;
}
}
// 查询用户信息 校验svc卡,余额购物车校验
// 查询用户信息 校验svc卡,余额购物车校验
AssortmentCustomerInfoVo
userLoginInfoDto
=
this
.
checkOrderByMember
(
createOrder
Vo
);
AssortmentCustomerInfoVo
userLoginInfoDto
=
this
.
checkOrderByMember
(
createOrder
BO
);
createOrderBO
.
setUserLoginInfoDto
(
userLoginInfoDto
);
createOrderBO
.
setUserLoginInfoDto
(
userLoginInfoDto
);
// 查询门店信息 营业时间 营业状态,服务器当前时间在营业时间内 点餐桌号
// 查询门店信息 营业时间 营业状态,服务器当前时间在营业时间内 点餐桌号
...
@@ -167,16 +167,13 @@ public class CheckOrder {
...
@@ -167,16 +167,13 @@ public class CheckOrder {
/**
/**
* 下单会员相关校验
* 下单会员相关校验
*/
*/
public
AssortmentCustomerInfoVo
checkOrderByMember
(
CreateOrder
Vo
createOrderVo
)
{
public
AssortmentCustomerInfoVo
checkOrderByMember
(
CreateOrder
BONew
createOrderBO
)
{
// 通过sessionId查询缓存中会员id
CreateOrderVo
createOrderVo
=
createOrderBO
.
getCreateOrderVo
();
String
sessionId
=
createOrderVo
.
getSessionId
();
// 通过sessionId查询缓存中会员id 外层已获取缓存用户信息
AssortmentCustomerInfoVo
userLoginInfoDto
=
c
ustomerInfoManager
.
getCustomerInfoByObject
(
sessionId
);
AssortmentCustomerInfoVo
userLoginInfoDto
=
c
reateOrderBO
.
getUserLoginInfoDto
(
);
if
(
userLoginInfoDto
==
null
||
StringUtils
.
isEmpty
(
userLoginInfoDto
.
getMemberId
()))
{
if
(
userLoginInfoDto
==
null
||
StringUtils
.
isEmpty
(
userLoginInfoDto
.
getMemberId
()))
{
throw
new
ServiceException
(
ResponseResult
.
NOT_LOGIN
);
throw
new
ServiceException
(
ResponseResult
.
NOT_LOGIN
);
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java
View file @
eb50901b
...
@@ -43,6 +43,7 @@ import com.freemud.sdk.api.assortment.order.request.order.GroupBuyRequest;
...
@@ -43,6 +43,7 @@ import com.freemud.sdk.api.assortment.order.request.order.GroupBuyRequest;
import
com.freemud.sdk.api.assortment.order.response.order.GroupBuyResponse
;
import
com.freemud.sdk.api.assortment.order.response.order.GroupBuyResponse
;
import
com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse
;
import
com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse
;
import
com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService
;
import
com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -65,8 +66,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
...
@@ -65,8 +66,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
private
WeChatClient
weChatClient
;
private
WeChatClient
weChatClient
;
@Autowired
@Autowired
private
ShoppingCartClient
shoppingCartClient
;
private
ShoppingCartClient
shoppingCartClient
;
@Autowired
private
LogUtil
logUtil
;
/**
/**
* 创建拼单订单
* 创建拼单订单
...
@@ -93,7 +93,11 @@ public class CollageOrderServiceImpl implements CollageOrderService {
...
@@ -93,7 +93,11 @@ public class CollageOrderServiceImpl implements CollageOrderService {
// 标记订单类型-4 拼单
// 标记订单类型-4 拼单
createOrderVo
.
setMarketingType
(
OrderMarketType
.
COLLAGE
.
getIndex
());
createOrderVo
.
setMarketingType
(
OrderMarketType
.
COLLAGE
.
getIndex
());
CreateOrderBONew
createOrderBO
=
new
CreateOrderBONew
(
createOrderVo
);
CreateOrderBONew
createOrderBO
=
new
CreateOrderBONew
(
createOrderVo
);
AssortmentCustomerInfoVo
assortmentCustomerInfoVo
=
customerInfoManager
.
getCustomerInfoByObject
(
createOrderVo
.
getSessionId
());
if
(
assortmentCustomerInfoVo
==
null
||
StringUtils
.
isEmpty
(
assortmentCustomerInfoVo
.
getMemberId
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
NOT_LOGIN
);
}
createOrderBO
.
setUserLoginInfoDto
(
assortmentCustomerInfoVo
);
BaseResponse
orderCreateResponse
=
this
.
orderService
.
createOrder
(
createOrderBO
);
BaseResponse
orderCreateResponse
=
this
.
orderService
.
createOrder
(
createOrderBO
);
// if (null != orderCreateResponse && null != orderCreateResponse.getResult()) {
// if (null != orderCreateResponse && null != orderCreateResponse.getResult()) {
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
eb50901b
...
@@ -311,21 +311,19 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -311,21 +311,19 @@ public class OrderServiceImpl implements Orderservice {
// 原来saas
// 原来saas
@Override
@Override
public
BaseResponse
createOrder
(
CreateOrderBONew
createOrderBO
)
{
public
BaseResponse
createOrder
(
CreateOrderBONew
createOrderBO
)
{
CreateOrderVo
createOrderVo
=
createOrderBO
.
getCreateOrderVo
();
CreateOrderBONew
createOrderBONew
=
new
CreateOrderBONew
(
createOrderVo
);
//创建订单前参数校验与数据获取
//创建订单前参数校验与数据获取
BaseResponse
checkResponse
=
checkOrder
.
checkCreateOrderInfo
(
createOrderBO
New
);
BaseResponse
checkResponse
=
checkOrder
.
checkCreateOrderInfo
(
createOrderBO
);
if
(
checkResponse
!=
null
&&
!
ResponseResult
.
SUCCESS
.
getCode
().
equals
(
checkResponse
.
getCode
())
)
{
if
(
checkResponse
!=
null
&&
!
ResponseResult
.
SUCCESS
.
getCode
().
equals
(
checkResponse
.
getCode
())
)
{
return
checkResponse
;
return
checkResponse
;
}
}
//创建订单调用集成,不区分订单类型
//创建订单调用集成,不区分订单类型
BaseResponse
createOrderOperateDtoResponse
=
this
.
sdkCreateOrder
(
createOrderBO
New
);
BaseResponse
createOrderOperateDtoResponse
=
this
.
sdkCreateOrder
(
createOrderBO
);
if
(
createOrderOperateDtoResponse
==
null
||
!
ResponseResult
.
SUCCESS
.
getCode
().
equals
(
createOrderOperateDtoResponse
.
getCode
())
||
createOrderOperateDtoResponse
.
getResult
()
==
null
)
{
if
(
createOrderOperateDtoResponse
==
null
||
!
ResponseResult
.
SUCCESS
.
getCode
().
equals
(
createOrderOperateDtoResponse
.
getCode
())
||
createOrderOperateDtoResponse
.
getResult
()
==
null
)
{
return
createOrderOperateDtoResponse
;
return
createOrderOperateDtoResponse
;
}
}
CreateOrderOperateDto
createOrderOperateDto
=
(
CreateOrderOperateDto
)
createOrderOperateDtoResponse
.
getResult
();
CreateOrderOperateDto
createOrderOperateDto
=
(
CreateOrderOperateDto
)
createOrderOperateDtoResponse
.
getResult
();
//创建支付
//创建支付
CreatePrepayRequestDto
createPrepayRequestDto
=
orderAdapter
.
convertToCreatePrepayRequestDto
(
createOrderBO
New
,
createOrderOperateDto
);
CreatePrepayRequestDto
createPrepayRequestDto
=
orderAdapter
.
convertToCreatePrepayRequestDto
(
createOrderBO
,
createOrderOperateDto
);
return
ResponseUtil
.
success
(
payServiceImpl
.
createPrepayOrder
(
createPrepayRequestDto
));
return
ResponseUtil
.
success
(
payServiceImpl
.
createPrepayOrder
(
createPrepayRequestDto
));
}
}
...
...
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