ソースを参照

fix[litemall-wx,litemall-wx-api]: 修复一些小问题。

Junling Bu 7 年 前
コミット
240caad9f8

+ 1 - 0
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java

@@ -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);
 
 

+ 8 - 1
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java

@@ -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());

+ 1 - 0
litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java

@@ -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);

+ 5 - 0
litemall-wx/pages/shopping/checkout/checkout.js

@@ -162,6 +162,11 @@ Page({
               }
             });
           }
+          else{
+            wx.redirectTo({
+              url: '/pages/payResult/payResult?status=0&orderId=' + orderId
+            });
+          }
         });
 
       } else {