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
240caad9
Commit
240caad9
authored
Jun 04, 2018
by
Junling Bu
Browse files
fix[litemall-wx,litemall-wx-api]: 修复一些小问题。
parent
098fefc9
Changes
4
Hide whitespace changes
Inline
Side-by-side
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
View file @
240caad9
...
...
@@ -237,6 +237,7 @@ public class WxAuthController {
user
.
setStatus
(
"可用"
);
user
.
setLastLoginTime
(
LocalDateTime
.
now
());
user
.
setLastLoginIp
(
IpUtil
.
client
(
request
));
user
.
setAddTime
(
LocalDateTime
.
now
());
userService
.
add
(
user
);
...
...
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
View file @
240caad9
...
...
@@ -84,7 +84,14 @@ public class WxHomeController {
l2List
.
add
(
catL2
.
getId
());
}
List
<
LitemallGoods
>
categoryGoods
=
goodsService
.
queryByCategory
(
l2List
,
0
,
5
);
List
<
LitemallGoods
>
categoryGoods
=
null
;
if
(
l2List
.
size
()
==
0
){
categoryGoods
=
new
ArrayList
<>();
}
else
{
categoryGoods
=
goodsService
.
queryByCategory
(
l2List
,
0
,
5
);
}
Map
catGoods
=
new
HashMap
();
catGoods
.
put
(
"id"
,
catL1
.
getId
());
catGoods
.
put
(
"name"
,
catL1
.
getName
());
...
...
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
View file @
240caad9
...
...
@@ -341,6 +341,7 @@ public class WxOrderController {
orderGoods
.
setNumber
(
cartGoods
.
getNumber
());
orderGoods
.
setGoodsSpecificationIds
(
cartGoods
.
getGoodsSpecificationIds
());
orderGoods
.
setGoodsSpecificationValues
(
cartGoods
.
getGoodsSpecificationValues
());
orderGoods
.
setAddTime
(
LocalDateTime
.
now
());
// 添加订单商品表项
orderGoodsService
.
add
(
orderGoods
);
...
...
litemall-wx/pages/shopping/checkout/checkout.js
View file @
240caad9
...
...
@@ -162,6 +162,11 @@ Page({
}
});
}
else
{
wx
.
redirectTo
({
url
:
'
/pages/payResult/payResult?status=0&orderId=
'
+
orderId
});
}
});
}
else
{
...
...
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