From 240caad9f82f1920f1f2edcd7f94c0013a15be05 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Mon, 4 Jun 2018 16:03:02 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-wx,litemall-wx-api]:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/linlinjava/litemall/wx/web/WxAuthController.java | 1 +
 .../org/linlinjava/litemall/wx/web/WxHomeController.java | 9 ++++++++-
 .../linlinjava/litemall/wx/web/WxOrderController.java    | 1 +
 litemall-wx/pages/shopping/checkout/checkout.js          | 5 +++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
index 93583ad0..ff820457 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAuthController.java
+++ b/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);
 
 
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
index 98a9432e..4b640030 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxHomeController.java
+++ b/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());
diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
index c8b9d72b..e38343e7 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java
+++ b/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);
diff --git a/litemall-wx/pages/shopping/checkout/checkout.js b/litemall-wx/pages/shopping/checkout/checkout.js
index 471ac4cc..360d9808 100644
--- a/litemall-wx/pages/shopping/checkout/checkout.js
+++ b/litemall-wx/pages/shopping/checkout/checkout.js
@@ -162,6 +162,11 @@ Page({
               }
             });
           }
+          else{
+            wx.redirectTo({
+              url: '/pages/payResult/payResult?status=0&orderId=' + orderId
+            });
+          }
         });
 
       } else {