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
66ae34f9
Commit
66ae34f9
authored
Sep 18, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
6位取餐码添加打印日志
parent
bc3b0615
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+4
-2
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
66ae34f9
...
@@ -447,9 +447,11 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -447,9 +447,11 @@ public class OrderServiceImpl implements Orderservice {
//更新取餐码
//更新取餐码
String
pickUpGoodNo
=
orderAdapter
.
generateTackCode
(
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
());
String
pickUpGoodNo
=
orderAdapter
.
generateTackCode
(
orderBean
.
getCompanyId
(),
orderBean
.
getShopId
());
BaseResponse
baseResponse
=
updatePickUpGoodNo
(
pickUpGoodNo
,
orderBean
,
wxappid
);
BaseResponse
baseResponse
=
updatePickUpGoodNo
(
pickUpGoodNo
,
orderBean
,
wxappid
);
log
.
info
(
"===="
+
baseResponse
.
getCode
());
if
(
baseResponse
.
getCode
().
equalsIgnoreCase
(
ResponseResult
.
SUCCESS
.
getCode
())){
if
(
baseResponse
.
getCode
().
equalsIgnoreCase
(
ResponseResult
.
SUCCESS
.
getCode
())){
payAccessResponse
.
getData
().
setTakeCode
(
pickUpGoodNo
);
payAccessResponse
.
getData
().
setTakeCode
(
pickUpGoodNo
);
}
}
log
.
info
(
"====payAccessResponse.getData().getTakeCode():"
+
payAccessResponse
.
getData
().
getTakeCode
());
// TODO 订单序号替换取餐码显示
// TODO 订单序号替换取餐码显示
takeCode
=
payAccessResponse
.
getData
().
getTakeCode
();
takeCode
=
payAccessResponse
.
getData
().
getTakeCode
();
daySeq
=
payAccessResponse
.
getData
().
getDaySeq
();
daySeq
=
payAccessResponse
.
getData
().
getDaySeq
();
...
@@ -464,6 +466,8 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -464,6 +466,8 @@ public class OrderServiceImpl implements Orderservice {
newShoppingCartClearDto
.
setSessionId
(
sessionId
);
newShoppingCartClearDto
.
setSessionId
(
sessionId
);
newShoppingCartClearDto
.
setOperationType
(
1
);
newShoppingCartClearDto
.
setOperationType
(
1
);
shoppingCartClient
.
clearShoppingCart
(
newShoppingCartClearDto
);
shoppingCartClient
.
clearShoppingCart
(
newShoppingCartClearDto
);
QueryByCodeResponse
queryByCodeResponse44
=
orderSdkService
.
getOrderInfo
(
orderBean
.
getOid
(),
0
,
LogTreadLocal
.
getTrackingNo
());
log
.
info
(
"queryByCodeResponse44.getResult():{}"
,
queryByCodeResponse44
.
getResult
());
if
(
StringUtils
.
isNotBlank
(
daySeq
)
&&
orderExtInfoDto
!=
null
&&
!
OrderType
.
TAKE_OUT
.
getCode
().
equals
(
orderBean
.
getType
()))
{
if
(
StringUtils
.
isNotBlank
(
daySeq
)
&&
orderExtInfoDto
!=
null
&&
!
OrderType
.
TAKE_OUT
.
getCode
().
equals
(
orderBean
.
getType
()))
{
String
storeAddress
=
StringUtils
.
isNotBlank
(
orderBean
.
getAddress
())
?
orderBean
.
getAddress
()
:
""
;
String
storeAddress
=
StringUtils
.
isNotBlank
(
orderBean
.
getAddress
())
?
orderBean
.
getAddress
()
:
""
;
orderBean
.
setAddress
(
storeAddress
);
orderBean
.
setAddress
(
storeAddress
);
...
@@ -2971,14 +2975,12 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2971,14 +2975,12 @@ public class OrderServiceImpl implements Orderservice {
if
(
null
!=
refundDeliveryFeeConfig
)
{
if
(
null
!=
refundDeliveryFeeConfig
)
{
String
mealCodeRule
=
refundDeliveryFeeConfig
.
getAppValue
();
String
mealCodeRule
=
refundDeliveryFeeConfig
.
getAppValue
();
if
(!
StringUtils
.
isEmpty
(
mealCodeRule
)
&&
"2"
.
equalsIgnoreCase
(
mealCodeRule
))
{
if
(!
StringUtils
.
isEmpty
(
mealCodeRule
)
&&
"2"
.
equalsIgnoreCase
(
mealCodeRule
))
{
log
.
info
(
"orderBean,partnerWxappConfigs:{},{}"
,
orderBean
.
getOid
(),
JsonUtil
.
toJSONString
(
partnerWxappConfigs
));
//更新db中的取餐码,生成取餐码
//更新db中的取餐码,生成取餐码
OrderModifyRelatingCodeReq
relatingCodeReq
=
new
OrderModifyRelatingCodeReq
();
OrderModifyRelatingCodeReq
relatingCodeReq
=
new
OrderModifyRelatingCodeReq
();
relatingCodeReq
.
setOrderCode
(
orderBean
.
getOid
());
relatingCodeReq
.
setOrderCode
(
orderBean
.
getOid
());
relatingCodeReq
.
setOperator
(
orderBean
.
getCreateUser
());
relatingCodeReq
.
setOperator
(
orderBean
.
getCreateUser
());
relatingCodeReq
.
setPartnerId
(
orderBean
.
getCompanyId
());
relatingCodeReq
.
setPartnerId
(
orderBean
.
getCompanyId
());
relatingCodeReq
.
setPickUpGoodsNo
(
pickUpGoodNo
);
relatingCodeReq
.
setPickUpGoodsNo
(
pickUpGoodNo
);
log
.
info
(
"relatingCodeReq:{}"
,
relatingCodeReq
);
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
updatePickUpGoodNo
(
relatingCodeReq
,
LogThreadLocal
.
getTrackingNo
());
BaseOrderResponse
baseOrderResponse
=
orderCenterSdkService
.
updatePickUpGoodNo
(
relatingCodeReq
,
LogThreadLocal
.
getTrackingNo
());
if
(
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
if
(
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
baseOrderResponse
.
getErrcode
().
toString
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ACTIVITY_QUERY_ERROR
.
ORDER_PICK_UP_GOOD_NO
);
return
ResponseUtil
.
error
(
ResponseResult
.
ACTIVITY_QUERY_ERROR
.
ORDER_PICK_UP_GOOD_NO
);
...
...
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