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 commentList = new HashMap(); + Map 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 data = new HashMap(); + Map 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 data = new HashMap(); + Map data = new HashMap<>(); List 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(); }