update: 原名称zmall统一修改litemall。

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")

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
     }),
   ]

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) {

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();
     }
 }

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<LitemallStorage> storageList = zmallStorageService.querySelective(key, name, page, limit, sort, order);
-        int total = zmallStorageService.countSelective(key, name, page, limit, sort, order);
+        List<LitemallStorage> storageList = litemallStorageService.querySelective(key, name, page, limit, sort, order);
+        int total = litemallStorageService.countSelective(key, name, page, limit, sort, order);
         Map<String, Object> 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();
     }

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();
     }
 
     /**