bug fixes

src/main/java/com/caimei/controller/order/OrderController.java

@@ -249,8 +249,8 @@ public class OrderController {
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
         List<CmMallOrder> orderList = orderService.myOrder(userID, orderState, organizeID);
-        CmMallPage<CmMallOrder> cmMallPage = new CmMallPage<>(orderList);
-        return model.success(cmMallPage);
+        CmMallPage<CmMallOrder> page = new CmMallPage<>(orderList);
+        return model.success(page);
     }
 
     /**

src/main/java/com/caimei/controller/products/HomePageController.java

@@ -46,8 +46,8 @@ public class HomePageController {
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
         List<CmMallOrganizeProducts> list = homePageService.classify(organizeProducts);
-        CmMallPage<CmMallOrganizeProducts> cmMallPage = new CmMallPage<>(list);
-        return CmWxJsonModel.newInstance().success(cmMallPage);
+        CmMallPage<CmMallOrganizeProducts> page = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(page);
     }
 
     /**
@@ -62,8 +62,8 @@ public class HomePageController {
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
         List<CmMallOrganizeProducts> list = homePageService.preferred(organizeProducts);
-        CmMallPage<CmMallOrganizeProducts> cmMallPage = new CmMallPage<>(list);
-        return CmWxJsonModel.newInstance().success(cmMallPage);
+        CmMallPage<CmMallOrganizeProducts> page = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(page);
     }
 
     /**
@@ -78,8 +78,8 @@ public class HomePageController {
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
         List<CmMallHospital> member = homePageService.member();
-        CmMallPage<CmMallHospital> cmMallPage = new CmMallPage<>(member);
-        return CmWxJsonModel.newInstance().success(cmMallPage);
+        CmMallPage<CmMallHospital> page = new CmMallPage<>(member);
+        return CmWxJsonModel.newInstance().success(page);
     }
 
     /**

src/main/java/com/caimei/controller/user/PersonalController.java

@@ -105,8 +105,8 @@ public class PersonalController {
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
         List<CmMallAddress> cmMallAddressList = personalService.findAddress(userID);
-        CmMallPage<CmMallAddress> cmMallPage = new CmMallPage<>(cmMallAddressList);
-        return cmMallPage;
+        CmMallPage<CmMallAddress> page = new CmMallPage<>(cmMallAddressList);
+        return page;
     }
 
     /**

src/main/java/com/caimei/service/order/impl/OrderServiceImpl.java

@@ -777,12 +777,15 @@ public class OrderServiceImpl implements OrderService {
         List<CmMallOrganizeProducts> organizeProductsList = orderMapper.oftenPurchase(userID, organizeID);
         for (CmMallOrganizeProducts organizeProducts : organizeProductsList) {
             organizeProducts.setMainImage(AppUtils.getImageURL("product", organizeProducts.getMainImage(), 0, domain));
+            if (organizeProducts.getLadderPriceFlag().equals("1")){
+
+            }
         }
-        CmMallPage<CmMallOrganizeProducts> cmMallPage = new CmMallPage<>(organizeProductsList);
+        CmMallPage<CmMallOrganizeProducts> page = new CmMallPage<>(organizeProductsList);
         //购物车数量
         Integer count = homePageMapper.cartQuantity(userID);
         if (count == null) count = 0;
-        map.put("cmMallPage", cmMallPage);
+        map.put("page", page);
         map.put("count", count);
         return map;
     }

src/main/java/com/caimei/service/products/impl/ShoppingServiceImpl.java

@@ -48,11 +48,11 @@ public class ShoppingServiceImpl implements ShoppingService {
                 cmMallShop.setTotalPrice(totalPrice);
             }
         }
-        CmMallPage<CmMallShop> cmMallPage = new CmMallPage<>(cmMallShopList);
+        CmMallPage<CmMallShop> page = new CmMallPage<>(cmMallShopList);
         Integer cartQuantity = homePageMapper.cartQuantity(userID);
         if (cartQuantity == null) cartQuantity = 0;
         logger.info("------------ShoppingServiceImpl.findAllCart.cartQuantity:"+cartQuantity);
-        map.put("cmMallPage", cmMallPage);
+        map.put("page", page);
         map.put("cartQuantity", cartQuantity);
         return map;
     }

src/main/java/com/caimei/service/user/impl/PersonalServiceImpl.java

@@ -73,12 +73,12 @@ public class PersonalServiceImpl implements PersonalService {
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
         List<CmMallUserBalanceRecord> list = personalMapper.touchBalance(balanceRecord);
-        CmMallPage<CmMallUserBalanceRecord> cmMallPage = new CmMallPage<>(list);
+        CmMallPage<CmMallUserBalanceRecord> page = new CmMallPage<>(list);
         Double ableUserMoney = personalMapper.ableUserMoney(balanceRecord.getUserId());
         if (ableUserMoney == null) ableUserMoney = 0d;
         String userMoney = String.format("%.2f", ableUserMoney);
         Map<String, Object> map = new HashMap();
-        map.put("cmMallPage", cmMallPage);
+        map.put("page", page);
         map.put("ableUserMoney", userMoney);
         return map;
     }

src/main/resources/mapper/HomePageMapper.xml

@@ -25,7 +25,8 @@
           p.name,
           cop.retailPrice,
           cop.id,
-          cop.organizeID
+          cop.organizeID,
+          cop.ladderPriceFlag
         FROM
           cm_mall_organize_products cop
           LEFT JOIN product p ON cop.productID = p.productID