From 4a4bc70509c2c550c979283ac1d4abdc9f96bf4c Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Sat, 7 Apr 2018 11:13:29 +0800
Subject: [PATCH] =?UTF-8?q?update[litemall-wx-api]:=20=E8=B0=83=E6=95=B4or?=
 =?UTF-8?q?der=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/linlinjava/litemall/wx/web/WxGoodsController.java   | 6 +++---
 .../org/linlinjava/litemall/wx/web/WxHomeController.java    | 2 +-
 .../org/linlinjava/litemall/wx/web/WxOrderController.java   | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
index 5c6c42de..b2c14a51 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
@@ -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(LocalDateTime.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);
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 34846376..85283d27 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
@@ -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);
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 a2f3c622..fd770d3f 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
@@ -353,9 +353,8 @@ public class WxOrderController {
 
         // 订单order_status没有字段用于标识删除
         // 而是存在专门的is_delete字段表示是否删除
-        order.setIsDelete(true);
+        orderService.deleteById(orderId);
 
-        orderService.update(order);
         return ResponseUtil.ok();
     }