From b9bdc03ecd3b695343bc0eef4aadc54bd2023b47 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Mon, 16 Apr 2018 13:16:56 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E5=8E=9F=E5=90=8D=E7=A7=B0zmall?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9litemall=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../litemall/admin/web/OrderController.java | 10 +++++----- litemall-admin/build/webpack.dev.conf.js | 2 +- .../org/linlinjava/litemall/db/Application.java | 2 +- .../linlinjava/litemall/db/util/OrderUtil.java | 8 ++++---- .../litemall/os/web/StorageController.java | 16 ++++++++-------- .../litemall/wx/web/WxOrderController.java | 10 +++++----- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/OrderController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/OrderController.java index 7968bb6c..1f5a61d7 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/OrderController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/OrderController.java @@ -76,12 +76,12 @@ public class OrderController { return ResponseUtil.badArgument(); } - LitemallOrder zmallOrder = orderService.findById(orderId); - if(zmallOrder == null){ + LitemallOrder litemallOrder = orderService.findById(orderId); + if(litemallOrder == null){ return ResponseUtil.badArgumentValue(); } - if(OrderUtil.isPayStatus(zmallOrder) || OrderUtil.isShipStatus(zmallOrder)){ + if(OrderUtil.isPayStatus(litemallOrder) || OrderUtil.isShipStatus(litemallOrder)){ LitemallOrder newOrder = new LitemallOrder(); newOrder.setId(orderId); newOrder.setShipChannel(order.getShipChannel()); @@ -95,8 +95,8 @@ public class OrderController { return ResponseUtil.badArgumentValue(); } - zmallOrder = orderService.findById(orderId); - return ResponseUtil.ok(zmallOrder); + litemallOrder = orderService.findById(orderId); + return ResponseUtil.ok(litemallOrder); } @PostMapping("/delete") diff --git a/litemall-admin/build/webpack.dev.conf.js b/litemall-admin/build/webpack.dev.conf.js index 56d7ecdf..96a11f51 100644 --- a/litemall-admin/build/webpack.dev.conf.js +++ b/litemall-admin/build/webpack.dev.conf.js @@ -55,7 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { template: 'index.html', inject: true, favicon: resolve('favicon.ico'), - title: 'zmall-admin', + title: 'litemall-admin', path: config.dev.assetsPublicPath + config.dev.assetsSubDirectory }), ] diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/Application.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/Application.java index 0cfb630f..41c85add 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/Application.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/Application.java @@ -5,7 +5,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -@MapperScan("org.linlinjava.zmall.db.dao") +@MapperScan("org.linlinjava.litemall.db.dao") public class Application { public static void main(String[] args) { diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java index 0c56aa93..7a127c1e 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/util/OrderUtil.java @@ -142,11 +142,11 @@ public class OrderUtil { } - public static boolean isPayStatus(LitemallOrder zmallOrder) { - return OrderUtil.STATUS_PAY == zmallOrder.getOrderStatus().shortValue(); + public static boolean isPayStatus(LitemallOrder litemallOrder) { + return OrderUtil.STATUS_PAY == litemallOrder.getOrderStatus().shortValue(); } - public static boolean isShipStatus(LitemallOrder zmallOrder) { - return OrderUtil.STATUS_SHIP == zmallOrder.getOrderStatus().shortValue(); + public static boolean isShipStatus(LitemallOrder litemallOrder) { + return OrderUtil.STATUS_SHIP == litemallOrder.getOrderStatus().shortValue(); } } diff --git a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/StorageController.java b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/StorageController.java index 7d2090a4..42181fc2 100644 --- a/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/StorageController.java +++ b/litemall-os-api/src/main/java/org/linlinjava/litemall/os/web/StorageController.java @@ -28,7 +28,7 @@ public class StorageController { @Autowired private StorageService storageService; @Autowired - private LitemallStorageService zmallStorageService; + private LitemallStorageService litemallStorageService; @Autowired private ObjectStorageConfig osConfig; @@ -43,7 +43,7 @@ public class StorageController { do{ key = CharUtil.getRandomString(20); - storageInfo = zmallStorageService.findByKey(key); + storageInfo = litemallStorageService.findByKey(key); } while(storageInfo != null); @@ -55,8 +55,8 @@ public class StorageController { @RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "limit", defaultValue = "10") Integer limit, String sort, String order){ - List storageList = zmallStorageService.querySelective(key, name, page, limit, sort, order); - int total = zmallStorageService.countSelective(key, name, page, limit, sort, order); + List storageList = litemallStorageService.querySelective(key, name, page, limit, sort, order); + int total = litemallStorageService.countSelective(key, name, page, limit, sort, order); Map data = new HashMap<>(); data.put("total", total); data.put("items", storageList); @@ -86,7 +86,7 @@ public class StorageController { storageInfo.setModified(LocalDateTime.now()); storageInfo.setKey(key); storageInfo.setUrl(url); - zmallStorageService.add(storageInfo); + litemallStorageService.add(storageInfo); return ResponseUtil.ok(storageInfo); } @@ -95,7 +95,7 @@ public class StorageController { if(id == null){ return ResponseUtil.badArgument(); } - LitemallStorage storageInfo = zmallStorageService.findById(id); + LitemallStorage storageInfo = litemallStorageService.findById(id); if(storageInfo == null){ return ResponseUtil.badArgumentValue(); } @@ -105,13 +105,13 @@ public class StorageController { @PostMapping("/update") public Object update(@RequestBody LitemallStorage litemallStorage) { - zmallStorageService.update(litemallStorage); + litemallStorageService.update(litemallStorage); return ResponseUtil.ok(litemallStorage); } @PostMapping("/delete") public Object delete(@RequestBody LitemallStorage litemallStorage) { - zmallStorageService.deleteByKey(litemallStorage.getKey()); + litemallStorageService.deleteByKey(litemallStorage.getKey()); storageService.delete(litemallStorage.getKey()); return ResponseUtil.ok(); } 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 6416ee6c..79cf723a 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 @@ -67,15 +67,15 @@ public class WxOrderController { public WxOrderController() { } - private String detailedAddress(LitemallAddress zmallAddress) { - Integer provinceId = zmallAddress.getProvinceId(); - Integer cityId = zmallAddress.getCityId(); - Integer areaId = zmallAddress.getAreaId(); + private String detailedAddress(LitemallAddress litemallAddress) { + Integer provinceId = litemallAddress.getProvinceId(); + Integer cityId = litemallAddress.getCityId(); + Integer areaId = litemallAddress.getAreaId(); String provinceName = regionService.findById(provinceId).getName(); String cityName = regionService.findById(cityId).getName(); String areaName = regionService.findById(areaId).getName(); String fullRegion = provinceName + " " + cityName + " " + areaName; - return fullRegion + " " + zmallAddress.getAddress(); + return fullRegion + " " + litemallAddress.getAddress(); } /**