Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
4a4bc705
Commit
4a4bc705
authored
Apr 07, 2018
by
Junling Bu
Browse files
update[litemall-wx-api]: 调整order删除操作。
parent
b184242c
Changes
3
Hide whitespace changes
Inline
Side-by-side
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
View file @
4a4bc705
...
...
@@ -98,7 +98,7 @@ public class WxGoodsController {
c
.
put
(
"picList"
,
comment
.
getPicUrls
());
commentsVo
.
add
(
c
);
}
Map
<
String
,
Object
>
commentList
=
new
HashMap
();
Map
<
String
,
Object
>
commentList
=
new
HashMap
<>
();
commentList
.
put
(
"count"
,
commentCount
);
commentList
.
put
(
"data"
,
commentsVo
);
...
...
@@ -111,13 +111,13 @@ public class WxGoodsController {
// 记录用户的足迹
if
(
userId
!=
null
)
{
LitemallFootprint
footprint
=
new
LitemallFootprint
();
footprint
.
setAddTime
(
LocalDate
.
now
());
footprint
.
setAddTime
(
LocalDate
Time
.
now
());
footprint
.
setUserId
(
userId
);
footprint
.
setGoodsId
(
id
);
footprintService
.
add
(
footprint
);
}
Map
<
String
,
Object
>
data
=
new
HashMap
();
Map
<
String
,
Object
>
data
=
new
HashMap
<>
();
data
.
put
(
"info"
,
info
);
data
.
put
(
"userHasCollect"
,
userHasCollect
);
data
.
put
(
"issue"
,
issue
);
...
...
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
View file @
4a4bc705
...
...
@@ -37,7 +37,7 @@ public class WxHomeController {
*/
@RequestMapping
(
"/index"
)
public
Object
index
()
{
Map
<
String
,
Object
>
data
=
new
HashMap
();
Map
<
String
,
Object
>
data
=
new
HashMap
<>
();
List
<
LitemallAd
>
banner
=
adService
.
queryByApid
(
1
);
data
.
put
(
"banner"
,
banner
);
...
...
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
View file @
4a4bc705
...
...
@@ -353,9 +353,8 @@ public class WxOrderController {
// 订单order_status没有字段用于标识删除
// 而是存在专门的is_delete字段表示是否删除
order
.
setIsDelete
(
true
);
order
Service
.
deleteById
(
orderId
);
orderService
.
update
(
order
);
return
ResponseUtil
.
ok
();
}
...
...
Write
Preview
Supports
Markdown
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