Browse Source

update[litemall-wx-api]: 调整order删除操作。

Junling Bu 7 years ago
parent
commit
4a4bc70509

+ 3 - 3
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());
             c.put("picList", comment.getPicUrls());
             commentsVo.add(c);
             commentsVo.add(c);
         }
         }
-        Map<String, Object> commentList = new HashMap();
+        Map<String, Object> commentList = new HashMap<>();
         commentList.put("count", commentCount);
         commentList.put("count", commentCount);
         commentList.put("data", commentsVo);
         commentList.put("data", commentsVo);
 
 
@@ -111,13 +111,13 @@ public class WxGoodsController {
         // 记录用户的足迹
         // 记录用户的足迹
         if(userId != null) {
         if(userId != null) {
             LitemallFootprint footprint = new LitemallFootprint();
             LitemallFootprint footprint = new LitemallFootprint();
-            footprint.setAddTime(LocalDate.now());
+            footprint.setAddTime(LocalDateTime.now());
             footprint.setUserId(userId);
             footprint.setUserId(userId);
             footprint.setGoodsId(id);
             footprint.setGoodsId(id);
             footprintService.add(footprint);
             footprintService.add(footprint);
         }
         }
 
 
-        Map<String, Object> data = new HashMap();
+        Map<String, Object> data = new HashMap<>();
         data.put("info", info);
         data.put("info", info);
         data.put("userHasCollect", userHasCollect);
         data.put("userHasCollect", userHasCollect);
         data.put("issue", issue);
         data.put("issue", issue);

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

@@ -37,7 +37,7 @@ public class WxHomeController {
      */
      */
     @RequestMapping("/index")
     @RequestMapping("/index")
     public Object index() {
     public Object index() {
-        Map<String, Object> data = new HashMap();
+        Map<String, Object> data = new HashMap<>();
 
 
         List<LitemallAd> banner = adService.queryByApid(1);
         List<LitemallAd> banner = adService.queryByApid(1);
         data.put("banner", banner);
         data.put("banner", banner);

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

@@ -353,9 +353,8 @@ public class WxOrderController {
 
 
         // 订单order_status没有字段用于标识删除
         // 订单order_status没有字段用于标识删除
         // 而是存在专门的is_delete字段表示是否删除
         // 而是存在专门的is_delete字段表示是否删除
-        order.setIsDelete(true);
+        orderService.deleteById(orderId);
 
 
-        orderService.update(order);
         return ResponseUtil.ok();
         return ResponseUtil.ok();
     }
     }