From 801fc1a6da2a0441cea02419ca8e2c56d5540cc2 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sat, 23 Jun 2018 10:28:48 +0800 Subject: [PATCH] =?UTF-8?q?fix[litemall-admin-api]=EF=BC=9A=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BF=A1=E6=81=AF=E7=9A=84=E6=97=B6=E5=80=99=E8=A1=A5?= =?UTF-8?q?=E5=85=A8=E6=B7=BB=E5=8A=A0=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../litemall/admin/web/AdminAdController.java | 2 ++ .../admin/web/AdminAddressController.java | 2 ++ .../admin/web/AdminAdminController.java | 2 ++ .../admin/web/AdminBrandController.java | 2 ++ .../admin/web/AdminCategoryController.java | 2 ++ .../admin/web/AdminCommentController.java | 2 ++ .../AdminGoodsSpecificationController.java | 2 ++ .../admin/web/AdminIssueController.java | 22 ++++++++++--------- .../admin/web/AdminKeywordController.java | 2 ++ .../admin/web/AdminProductController.java | 2 ++ .../admin/web/AdminTopicController.java | 2 ++ .../admin/web/AdminUserController.java | 3 ++- 12 files changed, 34 insertions(+), 11 deletions(-) diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java index d57b1398..03015713 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdController.java @@ -9,6 +9,7 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +46,7 @@ public class AdminAdController { if(adminId == null){ return ResponseUtil.unlogin(); } + ad.setAddTime(LocalDateTime.now()); adService.add(ad); return ResponseUtil.ok(ad); } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAddressController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAddressController.java index 89922198..4b947c44 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAddressController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAddressController.java @@ -11,6 +11,7 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -83,6 +84,7 @@ public class AdminAddressController { return ResponseUtil.fail(403, "手机号格式不正确"); } + address.setAddTime(LocalDateTime.now()); addressService.add(address); Map addressVo = toVo(address); diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java index 507eec81..543381ef 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java @@ -9,6 +9,7 @@ import org.linlinjava.litemall.db.service.LitemallAdminService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -72,6 +73,7 @@ public class AdminAdminController { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); String encodedPassword = encoder.encode(rawPassword); admin.setPassword(encodedPassword); + admin.setAddTime(LocalDateTime.now()); adminService.add(admin); return ResponseUtil.ok(admin); diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java index 26cd179f..ee1e6d36 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminBrandController.java @@ -9,6 +9,7 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +46,7 @@ public class AdminBrandController { if(adminId == null){ return ResponseUtil.unlogin(); } + brand.setAddTime(LocalDateTime.now()); brandService.add(brand); return ResponseUtil.ok(brand); } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java index 5eef9988..2313bade 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCategoryController.java @@ -9,6 +9,7 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +46,7 @@ public class AdminCategoryController { if(adminId == null){ return ResponseUtil.unlogin(); } + category.setAddTime(LocalDateTime.now()); categoryService.add(category); return ResponseUtil.ok(); } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCommentController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCommentController.java index 5b43ad21..c0156711 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCommentController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminCommentController.java @@ -9,6 +9,7 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +46,7 @@ public class AdminCommentController { if(adminId == null){ return ResponseUtil.unlogin(); } + comment.setAddTime(LocalDateTime.now()); commentService.add(comment); return ResponseUtil.ok(comment); } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsSpecificationController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsSpecificationController.java index 4de24f5b..4f7e7310 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsSpecificationController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminGoodsSpecificationController.java @@ -9,6 +9,7 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +46,7 @@ public class AdminGoodsSpecificationController { if(adminId == null){ return ResponseUtil.unlogin(); } + goodsSpecification.setAddTime(LocalDateTime.now()); goodsSpecificationService.add(goodsSpecification); return ResponseUtil.ok(goodsSpecification); } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java index 0d889bda..7ce96e7e 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminIssueController.java @@ -9,6 +9,7 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -41,12 +42,13 @@ public class AdminIssueController { } @PostMapping("/create") - public Object create(@LoginAdmin Integer adminId, @RequestBody LitemallIssue brand){ + public Object create(@LoginAdmin Integer adminId, @RequestBody LitemallIssue issue){ if(adminId == null){ return ResponseUtil.unlogin(); } - issueService.add(brand); - return ResponseUtil.ok(brand); + issue.setAddTime(LocalDateTime.now()); + issueService.add(issue); + return ResponseUtil.ok(issue); } @GetMapping("/read") @@ -59,25 +61,25 @@ public class AdminIssueController { return ResponseUtil.badArgument(); } - LitemallIssue brand = issueService.findById(id); - return ResponseUtil.ok(brand); + LitemallIssue issue = issueService.findById(id); + return ResponseUtil.ok(issue); } @PostMapping("/update") - public Object update(@LoginAdmin Integer adminId, @RequestBody LitemallIssue brand){ + public Object update(@LoginAdmin Integer adminId, @RequestBody LitemallIssue issue){ if(adminId == null){ return ResponseUtil.unlogin(); } - issueService.updateById(brand); - return ResponseUtil.ok(brand); + issueService.updateById(issue); + return ResponseUtil.ok(issue); } @PostMapping("/delete") - public Object delete(@LoginAdmin Integer adminId, @RequestBody LitemallIssue brand){ + public Object delete(@LoginAdmin Integer adminId, @RequestBody LitemallIssue issue){ if(adminId == null){ return ResponseUtil.unlogin(); } - issueService.deleteById(brand.getId()); + issueService.deleteById(issue.getId()); return ResponseUtil.ok(); } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java index c1d417a6..ee9d051b 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminKeywordController.java @@ -9,6 +9,7 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +46,7 @@ public class AdminKeywordController { if(adminId == null){ return ResponseUtil.unlogin(); } + keywords.setAddTime(LocalDateTime.now()); keywordService.add(keywords); return ResponseUtil.ok(keywords); } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminProductController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminProductController.java index cceaedfa..af9a1758 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminProductController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminProductController.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -85,6 +86,7 @@ public class AdminProductController { product.setGoodsNumber(0); product.setRetailPrice(new BigDecimal(0.00)); product.setGoodsSpecificationIds(goodsSpecificationIds); + product.setAddTime(LocalDateTime.now()); productService.add(product); return ResponseUtil.ok(); diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java index 455b2ad4..fb79166d 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminTopicController.java @@ -9,6 +9,7 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,6 +46,7 @@ public class AdminTopicController { if(adminId == null){ return ResponseUtil.unlogin(); } + topic.setAddTime(LocalDateTime.now()); topicService.add(topic); return ResponseUtil.ok(topic); } diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java index 36469866..a67577ad 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminUserController.java @@ -10,6 +10,7 @@ import org.linlinjava.litemall.core.util.ResponseUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -57,7 +58,7 @@ public class AdminUserController { @PostMapping("/create") public Object create(@LoginAdmin Integer adminId, @RequestBody LitemallUser user){ logger.debug(user); - + user.setAddTime(LocalDateTime.now()); userService.add(user); return ResponseUtil.ok(user); }