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
927453ec
Commit
927453ec
authored
Jul 14, 2020
by
huiyang.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
加购数量修改和订单类型翻译
parent
6681f016
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+6
-2
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
+2
-2
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
927453ec
...
...
@@ -959,8 +959,12 @@ public class OrderAdapter {
responseVo
.
setButtonEvaluate
(
orderViewStatusDto
.
getButtonEvaluate
());
responseVo
.
setButtonMealCode
(
orderViewStatusDto
.
getButtonMealCode
());
responseVo
.
setOrderType
(
ordersBean
.
getType
());
responseVo
.
setOrderTypeDesc
(
Optional
.
ofNullable
(
OrderTypeGather
.
getByCode
(
ordersBean
.
getType
()))
.
map
(
OrderTypeGather:
:
getDesc
).
orElse
(
""
));
if
(
IappIdType
.
WC_XCX
.
getCode
().
equals
(
iAppId
))
{
responseVo
.
setOrderTypeDesc
(
"围餐"
);
}
else
{
responseVo
.
setOrderTypeDesc
(
Optional
.
ofNullable
(
OrderTypeGather
.
getByCode
(
ordersBean
.
getType
()))
.
map
(
OrderTypeGather:
:
getDesc
).
orElse
(
""
));
}
responseVo
.
setOrderRemark
(
ordersBean
.
getRemark
());
if
(
ordersBean
.
getGmtModified
()
!=
null
)
{
responseVo
.
setModifiedTime
(
DateUtil
.
convert2String
(
new
Date
(
ordersBean
.
getGmtModified
()),
"yyyy-MM-dd HH:mm:ss"
));
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java
View file @
927453ec
...
...
@@ -645,8 +645,8 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
CartGoods
optionalCartGood
=
optionalGood
.
get
();
updateCartGoodId
=
optionalCartGood
.
getCartGoodsUid
();
checkGood
.
setCartGoodsUid
(
updateCartGoodId
);
checkGood
.
setQty
(
optionalCartGood
.
getQty
()
+
1
);
optionalCartGood
.
setQty
(
optionalCartGood
.
getQty
()
+
1
);
checkGood
.
setQty
(
optionalCartGood
.
getQty
()
+
cartGoods
.
getQty
()
);
optionalCartGood
.
setQty
(
optionalCartGood
.
getQty
()
+
cartGoods
.
getQty
()
);
}
}
...
...
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