优化名称

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

@@ -46,9 +46,9 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/confirm")
-    public WxJsonModel confirmOrder(Integer userId, String classifyIDS, Integer organizeID, String productIDs, Integer count) {
+    public CmWxJsonModel confirmOrder(Integer userId, String classifyIDS, Integer organizeID, String productIDs, Integer count) {
         Map<String, Object> map = orderService.confirmOrder(userId, classifyIDS, organizeID, productIDs, count);
-        return WxJsonModel.newInstance().success(map);
+        return CmWxJsonModel.newInstance().success(map);
     }
 
     /**
@@ -58,8 +58,8 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/share")
-    public WxJsonModel shareOrder(Integer orderID) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel shareOrder(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         String shareCode = null;
         try {
             shareCode = orderService.shareOrder(orderID);
@@ -74,9 +74,9 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/shareCode")
-    public WxJsonModel verifyShareCode(String shareCode, String code, Integer orderID, Integer userID,
-                                       Integer organizeID, HttpServletRequest request) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel verifyShareCode(String shareCode, String code, Integer orderID, Integer userID,
+                                         Integer organizeID, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         logger.info("Start get SessionKey");
         Map<String, Object> map = new HashMap<>();
         String referer = request.getHeader("Referer"); //获取当前微信小程序的环境
@@ -114,7 +114,7 @@ public class OrderController {
         if (orderID == null || userID == null || organizeID == null) {
             model.error("参数异常");
         }
-        WxJsonModel jsonModel = orderService.verifyShareCode(shareCode, openid, orderID, userID, organizeID);
+        CmWxJsonModel jsonModel = orderService.verifyShareCode(shareCode, openid, orderID, userID, organizeID);
         return jsonModel;
     }
 
@@ -123,8 +123,8 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/particulars")
-    public WxJsonModel particulars(Integer orderID) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel particulars(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         Map<String, Object> map = null;
         try {
             map = orderService.particulars(orderID);
@@ -156,28 +156,28 @@ public class OrderController {
     @Transactional
     @ResponseBody
     @RequestMapping("/submitOrder")
-    public synchronized WxJsonModel submitOrder(String params, HttpServletRequest request) {
-        WxJsonModel wxJsonModel = WxJsonModel.newInstance();
+    public synchronized CmWxJsonModel submitOrder(String params, HttpServletRequest request) {
+        CmWxJsonModel cmWxJsonModel = CmWxJsonModel.newInstance();
         logger.info(">>>>>>订单信息params:" + params);
         //检查用户是否登入
-//        CmOperationUser currentUser = SessionHelper.getCurrentUser(request);
+//        CmMallOperationUser currentUser = SessionHelper.getCurrentUser(request);
         HttpSession session = request.getSession();
         String openid = (String) session.getAttribute("openid");
         Integer organizeID1 = (Integer) session.getAttribute("organizeID");
-        CmOperationUser currentUser = loginService.doLogin(openid, organizeID1);
+        CmMallOperationUser currentUser = loginService.doLogin(openid, organizeID1);
         if (null == currentUser) {
-            return wxJsonModel.error("-1", "用户账户异常");
+            return cmWxJsonModel.error("-1", "用户账户异常");
         }
         Integer cmOperationID = currentUser.getId();//当前操作者ID
         if (StringUtils.isBlank(params)) {
-            return wxJsonModel.error("-1", "数据异常");
+            return cmWxJsonModel.error("-1", "数据异常");
         }
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             map = (Map<String, Object>) JsonMapper.getInstance().fromJsonString(params, Map.class);
             if (null == map) {
                 logger.info(">>>>>数据异常，参数不能为空");
-                return wxJsonModel.error("-1", "数据异常");
+                return cmWxJsonModel.error("-1", "数据异常");
             }
             Integer userId = (Integer) map.get("userId");
             Integer organizeID = (Integer) map.get("organizeID");
@@ -188,31 +188,31 @@ public class OrderController {
             Double orderShouldPayFee = Double.parseDouble(String.valueOf(map.get("orderShouldPayFee")));//此金额为前端计算，适用于后端计算金额复查
             //校验传入参数的正确性
             if (null == userId) {
-                return wxJsonModel.error("-1", "用户数据异常");
+                return cmWxJsonModel.error("-1", "用户数据异常");
             }
             if (null == organizeID) {
-                return wxJsonModel.error("-1", "组织数据异常");
+                return cmWxJsonModel.error("-1", "组织数据异常");
             }
             if (StringUtils.isEmpty(cartType)) {
-                return wxJsonModel.error("-1", "购买类型数据异常");
+                return cmWxJsonModel.error("-1", "购买类型数据异常");
             }
             if (null == addressID) {
-                return wxJsonModel.error("-1", "地址数据异常");
+                return cmWxJsonModel.error("-1", "地址数据异常");
             }
             if (null == orderInfo) {
-                return wxJsonModel.error("-1", "订单数据异常");
+                return cmWxJsonModel.error("-1", "订单数据异常");
             }
             if (StringUtils.isEmpty(balanceDeductionFlag)) {
-                return wxJsonModel.error("-1", "余额抵扣数据异常");
+                return cmWxJsonModel.error("-1", "余额抵扣数据异常");
             }
             if (null == orderShouldPayFee) {
-                return wxJsonModel.error("-1", "订单应付金额数据异常");
+                return cmWxJsonModel.error("-1", "订单应付金额数据异常");
             }
             //保存订单信息
-            return orderService.saveOrderInfo(wxJsonModel, userId, organizeID, cartType, addressID, orderInfo, balanceDeductionFlag, orderShouldPayFee, cmOperationID);
+            return orderService.saveOrderInfo(cmWxJsonModel, userId, organizeID, cartType, addressID, orderInfo, balanceDeductionFlag, orderShouldPayFee, cmOperationID);
         } catch (Exception e) {
             logger.info(">>>>>系统异常" + e.getMessage());
-            return wxJsonModel.error("-1", "数据异常");
+            return cmWxJsonModel.error("-1", "数据异常");
 
         }
     }
@@ -222,9 +222,9 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/logistics")
-    public WxJsonModel logistics(Integer orderID) {
-        WxJsonModel model = WxJsonModel.newInstance();
-        List<CmLogisticsBatch> logistics = null;
+    public CmWxJsonModel logistics(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        List<CmMallLogisticsBatch> logistics = null;
         try {
             logistics = orderService.logistics(orderID);
         } catch (Exception e) {
@@ -242,15 +242,15 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/myOrder")
-    public WxJsonModel myOrder(Integer orderState, Integer userID, Integer index, Integer pageSize, Integer organizeID) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel myOrder(Integer orderState, Integer userID, Integer index, Integer pageSize, Integer organizeID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         if (userID == null || orderState == null || organizeID == null) return model.error("参数异常");
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<CmOrder> orderList = orderService.myOrder(userID, orderState, organizeID);
-        Page<CmOrder> page = new Page<>(orderList);
-        return model.success(page);
+        List<CmMallOrder> orderList = orderService.myOrder(userID, orderState, organizeID);
+        CmMallPage<CmMallOrder> cmMallPage = new CmMallPage<>(orderList);
+        return model.success(cmMallPage);
     }
 
     /**
@@ -258,8 +258,8 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/purchase")
-    public WxJsonModel oftenPurchase(Integer userID, Integer organizeID, Integer index, Integer pageSize) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel oftenPurchase(Integer userID, Integer organizeID, Integer index, Integer pageSize) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         if (userID == null || organizeID == null) return model.error("参数异常");
         Map<String, Object> map = orderService.oftenPurchase(userID, organizeID, index, pageSize);
         return model.success(map);
@@ -270,8 +270,8 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/delete")
-    public WxJsonModel deleteOrder(Integer orderID) {
-        WxJsonModel model = null;
+    public CmWxJsonModel deleteOrder(Integer orderID) {
+        CmWxJsonModel model = null;
         try {
             model = orderService.deleteOrder(orderID);
         } catch (Exception e) {
@@ -285,8 +285,8 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/cancel")
-    public WxJsonModel cancelOrder(Integer orderID) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel cancelOrder(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         try {
             orderService.cancelOrder(orderID);
         } catch (Exception e) {
@@ -300,8 +300,8 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/affirm")
-    public WxJsonModel affirmCargo(Integer orderID) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel affirmCargo(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         try {
             orderService.affirmCargo(orderID);
         } catch (Exception e) {

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

@@ -1,9 +1,9 @@
 package com.caimei.controller.products;
 
 import com.caimei.entity.CmMallCart;
-import com.caimei.entity.CmOperationUser;
-import com.caimei.entity.CmOrganizeProducts;
-import com.caimei.entity.WxJsonModel;
+import com.caimei.entity.CmMallOperationUser;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmWxJsonModel;
 import com.caimei.service.products.DetailsService;
 import com.caimei.service.user.LoginService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +32,9 @@ public class DetailsController {
      */
     @ResponseBody
     @RequestMapping("/product")
-    public WxJsonModel productDetails(Integer id, Integer userID) {
-        CmOrganizeProducts organizeProducts = detailsService.productDetails(id, userID);
-        return WxJsonModel.newInstance().success(organizeProducts);
+    public CmWxJsonModel productDetails(Integer id, Integer userID) {
+        CmMallOrganizeProducts organizeProducts = detailsService.productDetails(id, userID);
+        return CmWxJsonModel.newInstance().success(organizeProducts);
     }
 
     /**
@@ -44,11 +44,11 @@ public class DetailsController {
      */
     @ResponseBody
     @RequestMapping("/addCart")
-    public synchronized WxJsonModel addCart(@RequestBody CmMallCart cmMallCart, HttpServletRequest request) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public synchronized CmWxJsonModel addCart(@RequestBody CmMallCart cmMallCart, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         if (cmMallCart == null) return model.error("参数异常");
         String openid = (String) request.getSession().getAttribute("openid");
-        CmOperationUser operationUser = loginService.doLogin(openid, cmMallCart.getOrganizeID());
+        CmMallOperationUser operationUser = loginService.doLogin(openid, cmMallCart.getOrganizeID());
         if (operationUser == null) return model.error("账户异常");
         Integer count = 0;
         try {

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

@@ -28,9 +28,9 @@ public class HomePageController {
      */
     @ResponseBody
     @RequestMapping("/information")
-    public WxJsonModel information(Integer organizeID, Integer userID) {
+    public CmWxJsonModel information(Integer organizeID, Integer userID) {
         Map<String, Object> map = homePageService.information(organizeID, userID);
-        return WxJsonModel.newInstance().success(map);
+        return CmWxJsonModel.newInstance().success(map);
     }
 
     /**
@@ -40,13 +40,13 @@ public class HomePageController {
      */
     @ResponseBody
     @RequestMapping("/classify")
-    public WxJsonModel classify(CmOrganizeProducts organizeProducts, Integer index, Integer pageSize) {
+    public CmWxJsonModel classify(CmMallOrganizeProducts organizeProducts, Integer index, Integer pageSize) {
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<CmOrganizeProducts> list = homePageService.classify(organizeProducts);
-        Page<CmOrganizeProducts> page = new Page<>(list);
-        return WxJsonModel.newInstance().success(page);
+        List<CmMallOrganizeProducts> list = homePageService.classify(organizeProducts);
+        CmMallPage<CmMallOrganizeProducts> cmMallPage = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(cmMallPage);
     }
 
     /**
@@ -56,13 +56,13 @@ public class HomePageController {
      */
     @ResponseBody
     @RequestMapping("/preferred")
-    public WxJsonModel preferred(CmOrganizeProducts organizeProducts, Integer index, Integer pageSize) {
+    public CmWxJsonModel preferred(CmMallOrganizeProducts organizeProducts, Integer index, Integer pageSize) {
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<CmOrganizeProducts> list = homePageService.preferred(organizeProducts);
-        Page<CmOrganizeProducts> page = new Page<>(list);
-        return WxJsonModel.newInstance().success(page);
+        List<CmMallOrganizeProducts> list = homePageService.preferred(organizeProducts);
+        CmMallPage<CmMallOrganizeProducts> cmMallPage = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(cmMallPage);
     }
 
     /**
@@ -72,13 +72,13 @@ public class HomePageController {
      */
     @ResponseBody
     @RequestMapping("/member")
-    public WxJsonModel member(Integer index, Integer pageSize) {
+    public CmWxJsonModel member(Integer index, Integer pageSize) {
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<hospital> member = homePageService.member();
-        Page<hospital> page = new Page<>(member);
-        return WxJsonModel.newInstance().success(page);
+        List<CmMallHospital> member = homePageService.member();
+        CmMallPage<CmMallHospital> cmMallPage = new CmMallPage<>(member);
+        return CmWxJsonModel.newInstance().success(cmMallPage);
     }
 
     /**
@@ -88,8 +88,8 @@ public class HomePageController {
      */
     @ResponseBody
     @RequestMapping("/afterSale")
-    public WxJsonModel afterSale(Integer organizeID) {
+    public CmWxJsonModel afterSale(Integer organizeID) {
         CmMallOrganize organize = homePageService.afterSale(organizeID);
-        return WxJsonModel.newInstance().success(organize);
+        return CmWxJsonModel.newInstance().success(organize);
     }
 }

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

@@ -1,8 +1,8 @@
 package com.caimei.controller.products;
 
 import com.caimei.entity.CmMallCart;
-import com.caimei.entity.CmOperationUser;
-import com.caimei.entity.WxJsonModel;
+import com.caimei.entity.CmMallOperationUser;
+import com.caimei.entity.CmWxJsonModel;
 import com.caimei.service.products.ShoppingService;
 import com.caimei.service.user.LoginService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +30,8 @@ public class ShoppingController {
      */
     @ResponseBody
     @RequestMapping("/cart")
-    public WxJsonModel cart(Integer userID, Integer organizeID, Integer index, Integer pageSize) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel cart(Integer userID, Integer organizeID, Integer index, Integer pageSize) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         Map<String, Object> map = shoppingService.findAllCart(userID, index, pageSize);
@@ -54,12 +54,12 @@ public class ShoppingController {
      */
     @ResponseBody
     @RequestMapping("/delete")
-    public WxJsonModel deleteCart(Integer userID, String productIDs, HttpServletRequest request) {
-        WxJsonModel model = WxJsonModel.newInstance();
+    public CmWxJsonModel deleteCart(Integer userID, String productIDs, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
         HttpSession session = request.getSession();
         String openid = (String) session.getAttribute("openid");
         Integer organizeID = (Integer) session.getAttribute("organizeID");
-        CmOperationUser operationUser = loginService.doLogin(openid, organizeID);
+        CmMallOperationUser operationUser = loginService.doLogin(openid, organizeID);
         if (operationUser == null) return model.error("账户异常");
         try {
             shoppingService.deleteCart(userID, productIDs);

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

@@ -2,8 +2,8 @@ package com.caimei.controller.user;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.caimei.entity.CmOperationUser;
-import com.caimei.entity.WxJsonModel;
+import com.caimei.entity.CmMallOperationUser;
+import com.caimei.entity.CmWxJsonModel;
 import com.caimei.service.user.LoginService;
 import com.caimei.utils.HttpRequest;
 import com.caimei.utils.SessionHelper;
@@ -39,9 +39,9 @@ public class LoginController {
     @Autowired
     private Environment env;
 
-    public WxJsonModel login(String code, HttpServletRequest request, Integer organizeID) {
+    public CmWxJsonModel login(String code, HttpServletRequest request, Integer organizeID) {
         logger.info("Start get SessionKey");
-        WxJsonModel res = WxJsonModel.newInstance();
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
         Map<String, Object> map = new HashMap<>();
         String referer = request.getHeader("Referer"); //获取当前微信小程序的环境
         logger.info("referer-is----:" + referer);
@@ -88,11 +88,11 @@ public class LoginController {
      */
     @ResponseBody
     @RequestMapping("/doLogin")
-    public WxJsonModel doLogin(@RequestParam(value = "code", required = true) String code,
-                               @RequestParam(value = "userOrganizeID") Integer userOrganizeID,
-                               HttpServletRequest request) {
-        WxJsonModel res = WxJsonModel.newInstance();
-        WxJsonModel model = login(code, request, userOrganizeID);
+    public CmWxJsonModel doLogin(@RequestParam(value = "code", required = true) String code,
+                                 @RequestParam(value = "userOrganizeID") Integer userOrganizeID,
+                                 HttpServletRequest request) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
+        CmWxJsonModel model = login(code, request, userOrganizeID);
         if (model.getCode().equals("-1")) {
             return model;
         }
@@ -102,7 +102,7 @@ public class LoginController {
         String sessionId = session.getId();
         session.setAttribute("openid", openid);
         session.setAttribute("organizeID", userOrganizeID);
-        CmOperationUser operationUser = loginService.doLogin(openid, userOrganizeID);
+        CmMallOperationUser operationUser = loginService.doLogin(openid, userOrganizeID);
         if (operationUser == null) {
             String mobile = loginService.cellPhone(userOrganizeID);
             return res.error("-1", mobile, "游客,请登录");
@@ -122,13 +122,13 @@ public class LoginController {
      */
     @RequestMapping("/isEnabled")
     @ResponseBody
-    public WxJsonModel isEnabled(String invitationCode, Integer userOrganizeID) {
-        WxJsonModel res = WxJsonModel.newInstance();
+    public CmWxJsonModel isEnabled(String invitationCode, Integer userOrganizeID) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
         String mobile = loginService.cellPhone(userOrganizeID);
         if (invitationCode == null || invitationCode.equals("")) {
             return res.error("0", mobile);
         }
-        CmOperationUser operationUser = loginService.isEnabled(invitationCode, userOrganizeID);
+        CmMallOperationUser operationUser = loginService.isEnabled(invitationCode, userOrganizeID);
         if (operationUser == null) {
             return res.error("-1", "邀请码错误");
         }
@@ -161,15 +161,15 @@ public class LoginController {
      */
     @RequestMapping("/register")
     @ResponseBody
-    public WxJsonModel register(@RequestParam(value = "code", required = true) String code,
-                                CmOperationUser operationUser, HttpServletRequest request) {
-        WxJsonModel model = login(code, request, operationUser.getUserOrganizeID());
+    public CmWxJsonModel register(@RequestParam(value = "code", required = true) String code,
+                                  CmMallOperationUser operationUser, HttpServletRequest request) {
+        CmWxJsonModel model = login(code, request, operationUser.getUserOrganizeID());
         if (model.getCode().equals("-1")) {
             return model;
         }
         String openid = (String) model.getData();
         operationUser.setOpenid(openid);
-        WxJsonModel jsonModel = loginService.update(operationUser, request);
+        CmWxJsonModel jsonModel = loginService.update(operationUser, request);
         return jsonModel;
     }
 }

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

@@ -34,10 +34,10 @@ public class PersonalController {
      */
     @RequestMapping("/myCentre")
     @ResponseBody
-    public WxJsonModel myCentre(CmOperationUser operationUser) {
-        WxJsonModel res = WxJsonModel.newInstance();
-        Club club = personalService.myCentre(operationUser);
-        return res.success("1", club);
+    public CmWxJsonModel myCentre(CmMallOperationUser operationUser) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
+        CmMallClub cmMallClub = personalService.myCentre(operationUser);
+        return res.success("1", cmMallClub);
     }
 
     /**
@@ -47,7 +47,7 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/touchBalance")
-    public Map<String, Object> touchBalance(int year, int month, Integer index, Integer pageSize, CmUserBalanceRecord balanceRecord) {
+    public Map<String, Object> touchBalance(int year, int month, Integer index, Integer pageSize, CmMallUserBalanceRecord balanceRecord) {
         Map<String, Object> map = personalService.touchBalance(index, pageSize, year, month, balanceRecord);
         return map;
     }
@@ -57,8 +57,8 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/address")
-    public List<Province> address() {
-        List<Province> list = personalService.address();
+    public List<CmMallProvince> address() {
+        List<CmMallProvince> list = personalService.address();
         return list;
     }
 
@@ -67,9 +67,9 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/province")
-    public List<Province> getProvince() {
-        List<Province> provinceList = personalService.getProvince();
-        return provinceList;
+    public List<CmMallProvince> getProvince() {
+        List<CmMallProvince> cmMallProvinceList = personalService.getProvince();
+        return cmMallProvinceList;
     }
 
     /**
@@ -77,9 +77,9 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/city")
-    public List<City> getCity(Long provinceid) {
-        List<City> cityList = personalService.getCity(provinceid);
-        return cityList;
+    public List<CmMallCity> getCity(Long provinceid) {
+        List<CmMallCity> cmMallCityList = personalService.getCity(provinceid);
+        return cmMallCityList;
     }
 
     /**
@@ -87,9 +87,9 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/town")
-    public List<Town> getTown(Integer cityid) {
-        List<Town> townList = personalService.getTown(cityid);
-        return townList;
+    public List<CmMallTown> getTown(Integer cityid) {
+        List<CmMallTown> cmMallTownList = personalService.getTown(cityid);
+        return cmMallTownList;
     }
 
     /**
@@ -100,13 +100,13 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/findAddress")
-    public Page<Address> findAddress(Integer userID, Integer index, Integer pageSize) {
+    public CmMallPage<CmMallAddress> findAddress(Integer userID, Integer index, Integer pageSize) {
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<Address> addressList = personalService.findAddress(userID);
-        Page<Address> page = new Page<>(addressList);
-        return page;
+        List<CmMallAddress> cmMallAddressList = personalService.findAddress(userID);
+        CmMallPage<CmMallAddress> cmMallPage = new CmMallPage<>(cmMallAddressList);
+        return cmMallPage;
     }
 
     /**
@@ -116,15 +116,15 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public WxJsonModel saveAddress(@RequestBody Address address, String code, HttpServletRequest request) {
-        WxJsonModel res = WxJsonModel.newInstance();
-        if (address == null) return res.error("参数异常");
+    public CmWxJsonModel saveAddress(@RequestBody CmMallAddress cmMallAddress, String code, HttpServletRequest request) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
+        if (cmMallAddress == null) return res.error("参数异常");
         //判断是否处于登录状态
         String openid = (String) request.getSession().getAttribute("openid");
-        CmOperationUser operationUser = loginService.doLogin(openid, address.getUserOrganizeID());
+        CmMallOperationUser operationUser = loginService.doLogin(openid, cmMallAddress.getUserOrganizeID());
         if (operationUser == null) return res.error("账户异常");
         try {
-            personalService.saveAddress(address);
+            personalService.saveAddress(cmMallAddress);
         } catch (Exception e) {
             return res.error("保存失败");
         }
@@ -136,11 +136,11 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/delete")
-    public WxJsonModel deleteAddress(Integer addressID, String code, Integer userOrganizeID, HttpServletRequest request) {
-        WxJsonModel res = WxJsonModel.newInstance();
+    public CmWxJsonModel deleteAddress(Integer addressID, String code, Integer userOrganizeID, HttpServletRequest request) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
         //判断是否处于登录状态
         String openid = (String) request.getSession().getAttribute("openid");
-        CmOperationUser operationUser = loginService.doLogin(openid, userOrganizeID);
+        CmMallOperationUser operationUser = loginService.doLogin(openid, userOrganizeID);
         if (operationUser == null) return res.error("账户异常");
         try {
             personalService.deleteAddress(addressID);
@@ -155,9 +155,9 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/invoice")
-    public WxJsonModel invoice(@RequestBody UserInvoiceInfo userInvoiceInfo) {
-        if (userInvoiceInfo == null) return WxJsonModel.newInstance().error("参数异常");
-        WxJsonModel jsonModel = personalService.invoice(userInvoiceInfo);
+    public CmWxJsonModel invoice(@RequestBody CmMallUserInvoiceInfo cmMallUserInvoiceInfo) {
+        if (cmMallUserInvoiceInfo == null) return CmWxJsonModel.newInstance().error("参数异常");
+        CmWxJsonModel jsonModel = personalService.invoice(cmMallUserInvoiceInfo);
         return jsonModel;
     }
 }

src/main/java/com/caimei/entity/Address.java → src/main/java/com/caimei/entity/CmMallAddress.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class Address implements Serializable {
+public class CmMallAddress implements Serializable {
     private Integer addressID; //用户地址ID
     private Integer userID; //用户ID
     private String shouHuoRen; //收货人

src/main/java/com/caimei/entity/BpOrderUserInfo.java → src/main/java/com/caimei/entity/CmMallBpOrderUserInfo.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class BpOrderUserInfo implements Serializable {
+public class CmMallBpOrderUserInfo implements Serializable {
     private Integer id;
     private Integer orderId;//订单ID
     private Integer clubId;//机构ID

src/main/java/com/caimei/entity/brand.java → src/main/java/com/caimei/entity/CmMallBrand.java

@@ -3,7 +3,7 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.List;
 
-public class brand implements Serializable {
+public class CmMallBrand implements Serializable {
     private Integer id;
     private String name;         //品牌名称
     private String logo;         //品牌logo
@@ -16,7 +16,7 @@ public class brand implements Serializable {
     private String delFlag;      //删除标记 0 否，其余是
     private String certificate;  //品牌证书
     private String certifiedPhoto;  //认证照片
-    private List<hospital> hospitals; //医院信息
+    private List<CmMallHospital> CmMallHospitals; //医院信息
     private Integer sort;  //排序值
     private String securityLink;   //防伪链接
 
@@ -132,17 +132,17 @@ public class brand implements Serializable {
         this.delFlag = delFlag;
     }
 
-    public List<hospital> getHospitals() {
-        return hospitals;
+    public List<CmMallHospital> getCmMallHospitals() {
+        return CmMallHospitals;
     }
 
-    public void setHospitals(List<hospital> hospitals) {
-        this.hospitals = hospitals;
+    public void setCmMallHospitals(List<CmMallHospital> cmMallHospitals) {
+        this.CmMallHospitals = cmMallHospitals;
     }
 
     @Override
     public String toString() {
-        return "brand{" +
+        return "CmMallBrand{" +
                 "id=" + id +
                 ", name='" + name + '\'' +
                 ", logo='" + logo + '\'' +
@@ -155,7 +155,7 @@ public class brand implements Serializable {
                 ", delFlag='" + delFlag + '\'' +
                 ", certificate='" + certificate + '\'' +
                 ", certifiedPhoto='" + certifiedPhoto + '\'' +
-                ", hospitals=" + hospitals +
+                ", CmMallHospitals=" + CmMallHospitals +
                 '}';
     }
 }

src/main/java/com/caimei/entity/City.java → src/main/java/com/caimei/entity/CmMallCity.java

@@ -4,12 +4,12 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.List;
 
-public class City implements Serializable {
+public class CmMallCity implements Serializable {
     private Integer cityid; //市ID
     private Integer provinceid; //所属省ID
     private String name;        //市名
     private String validflag;   //是否有效(0 无效,1 有效)
-    private List<Town> towns;   //下面的区
+    private List<CmMallTown> cmMallTowns;   //下面的区
 
     public Integer getCityid() {
         return cityid;
@@ -43,11 +43,11 @@ public class City implements Serializable {
         this.validflag = validflag;
     }
 
-    public List<Town> getTowns() {
-        return towns;
+    public List<CmMallTown> getCmMallTowns() {
+        return cmMallTowns;
     }
 
-    public void setTowns(List<Town> towns) {
-        this.towns = towns;
+    public void setCmMallTowns(List<CmMallTown> cmMallTowns) {
+        this.cmMallTowns = cmMallTowns;
     }
 }

src/main/java/com/caimei/entity/Club.java → src/main/java/com/caimei/entity/CmMallClub.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class Club implements Serializable {
+public class CmMallClub implements Serializable {
     private Integer clubID;
     private Integer userID;
     private Integer clubTypeID;//会所类型

src/main/java/com/caimei/entity/CmDiscernReceipt.java → src/main/java/com/caimei/entity/CmMallDiscernReceipt.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class CmDiscernReceipt implements Serializable {
+public class CmMallDiscernReceipt implements Serializable {
     private Integer id;
     private String payWay;  //用户付款方式：1线上，2线下
     private String payType; //付款类型：1建设银行7297、2广发银行0115、3中信银行7172、4中信银行0897、5中信银行0897-财付通、6中信银行0897-支付宝、7线上-支付宝、8线上-微信支付、9线上-快钱支付

src/main/java/com/caimei/entity/FreePostageCard.java → src/main/java/com/caimei/entity/CmMallFreePostageCard.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class FreePostageCard implements Serializable {
+public class CmMallFreePostageCard implements Serializable {
     private Integer id;
     private Integer userID;     //用户ID,关联user表的userID
     private String freePostFlag;    //免邮标志：0不包邮、1包邮

src/main/java/com/caimei/entity/hospital.java → src/main/java/com/caimei/entity/CmMallHospital.java

@@ -3,7 +3,7 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.List;
 
-public class hospital implements Serializable {
+public class CmMallHospital implements Serializable {
     private Integer id;
     private String name;                //医院名称
     private String provinceCityDistrict;//医院地址省市区（地址前部分）
@@ -25,7 +25,7 @@ public class hospital implements Serializable {
     private String introduction;        //医院简介
     private String delFlag;             //删除标记 0 否，其余是
     private String creationVip;         //是不是创始会员 1是的, 0不是的
-    private List<brand> brands;         //品牌
+    private List<CmMallBrand> CmMallBrands;         //品牌
     private Integer sort;  //排序值
 
     public Integer getSort() {
@@ -204,17 +204,17 @@ public class hospital implements Serializable {
         this.creationVip = creationVip;
     }
 
-    public List<brand> getBrands() {
-        return brands;
+    public List<CmMallBrand> getCmMallBrands() {
+        return CmMallBrands;
     }
 
-    public void setBrands(List<brand> brands) {
-        this.brands = brands;
+    public void setCmMallBrands(List<CmMallBrand> cmMallBrands) {
+        this.CmMallBrands = cmMallBrands;
     }
 
     @Override
     public String toString() {
-        return "hospital{" +
+        return "CmMallHospital{" +
                 "id=" + id +
                 ", name='" + name + '\'' +
                 ", provinceCityDistrict='" + provinceCityDistrict + '\'' +
@@ -236,7 +236,7 @@ public class hospital implements Serializable {
                 ", introduction='" + introduction + '\'' +
                 ", delFlag='" + delFlag + '\'' +
                 ", creationVip='" + creationVip + '\'' +
-                ", brands=" + brands +
+                ", CmMallBrands=" + CmMallBrands +
                 '}';
     }
 }

src/main/java/com/caimei/entity/CmLogisticsBatch.java → src/main/java/com/caimei/entity/CmMallLogisticsBatch.java

@@ -9,7 +9,7 @@ import java.util.List;
  * @author 李俊
  * @version 2019-12-17
  */
-public class CmLogisticsBatch implements Serializable {
+public class CmMallLogisticsBatch implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private Integer id;
@@ -22,15 +22,15 @@ public class CmLogisticsBatch implements Serializable {
     private String updateDate;    //更新时间
     private String deliveryTime;        // 发货时间
     private String receiptTime;        // 收货时间
-    private List<CmLogisticsRecord> cmLogisticsRecords;//该批次订单商品记录
-    private List<LogisticsInfo> logisticsInfos;//该批次物流信息
-    private List<CmShopOrder> shopOrderList;
+    private List<CmMallLogisticsRecord> cmMallLogisticsRecords;//该批次订单商品记录
+    private List<CmMallLogisticsInfo> cmMallLogisticsInfos;//该批次物流信息
+    private List<CmMallShopOrder> shopOrderList;
 
-    public List<CmShopOrder> getShopOrderList() {
+    public List<CmMallShopOrder> getShopOrderList() {
         return shopOrderList;
     }
 
-    public void setShopOrderList(List<CmShopOrder> shopOrderList) {
+    public void setShopOrderList(List<CmMallShopOrder> shopOrderList) {
         this.shopOrderList = shopOrderList;
     }
 
@@ -98,20 +98,20 @@ public class CmLogisticsBatch implements Serializable {
         this.receiptTime = receiptTime;
     }
 
-    public List<CmLogisticsRecord> getCmLogisticsRecords() {
-        return cmLogisticsRecords;
+    public List<CmMallLogisticsRecord> getCmMallLogisticsRecords() {
+        return cmMallLogisticsRecords;
     }
 
-    public void setCmLogisticsRecords(List<CmLogisticsRecord> cmLogisticsRecords) {
-        this.cmLogisticsRecords = cmLogisticsRecords;
+    public void setCmMallLogisticsRecords(List<CmMallLogisticsRecord> cmMallLogisticsRecords) {
+        this.cmMallLogisticsRecords = cmMallLogisticsRecords;
     }
 
-    public List<LogisticsInfo> getLogisticsInfos() {
-        return logisticsInfos;
+    public List<CmMallLogisticsInfo> getCmMallLogisticsInfos() {
+        return cmMallLogisticsInfos;
     }
 
-    public void setLogisticsInfos(List<LogisticsInfo> logisticsInfos) {
-        this.logisticsInfos = logisticsInfos;
+    public void setCmMallLogisticsInfos(List<CmMallLogisticsInfo> cmMallLogisticsInfos) {
+        this.cmMallLogisticsInfos = cmMallLogisticsInfos;
     }
 
     public String getUpdateDate() {

src/main/java/com/caimei/entity/LogisticsInfo.java → src/main/java/com/caimei/entity/CmMallLogisticsInfo.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @author 李俊
  * @version 2019-12-17
  */
-public class LogisticsInfo implements Serializable {
+public class CmMallLogisticsInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Long id;
@@ -36,21 +36,21 @@ public class LogisticsInfo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date deliveryTime; //发货时间
 
-    private List<Router> routers = new ArrayList<>();//此对象使用在转换info格式提供前端使用。JSONArray.parseArray(info, Router.class)
-    private List<CmLogisticsRecord> logisticsRecordList;    //物流批次
+    private List<CmMallRouter> cmMallRouters = new ArrayList<>();//此对象使用在转换info格式提供前端使用。JSONArray.parseArray(info, CmMallRouter.class)
+    private List<CmMallLogisticsRecord> logisticsRecordList;    //物流批次
 
-    public List<CmLogisticsRecord> getLogisticsRecordList() {
+    public List<CmMallLogisticsRecord> getLogisticsRecordList() {
         return logisticsRecordList;
     }
 
-    public void setLogisticsRecordList(List<CmLogisticsRecord> logisticsRecordList) {
+    public void setLogisticsRecordList(List<CmMallLogisticsRecord> logisticsRecordList) {
         this.logisticsRecordList = logisticsRecordList;
     }
 
-    public LogisticsInfo() {
+    public CmMallLogisticsInfo() {
     }
 
-    public LogisticsInfo(Long id) {
+    public CmMallLogisticsInfo(Long id) {
         this.id = id;
     }
 
@@ -166,12 +166,12 @@ public class LogisticsInfo implements Serializable {
         this.remarks = remarks;
     }
 
-    public List<Router> getRouters() {
-        return routers;
+    public List<CmMallRouter> getCmMallRouters() {
+        return cmMallRouters;
     }
 
-    public void setRouters(List<Router> routers) {
-        this.routers = routers;
+    public void setCmMallRouters(List<CmMallRouter> cmMallRouters) {
+        this.cmMallRouters = cmMallRouters;
     }
 
     public Date getDeliveryTime() {

src/main/java/com/caimei/entity/CmLogisticsRecord.java → src/main/java/com/caimei/entity/CmMallLogisticsRecord.java

@@ -9,7 +9,7 @@ import java.util.List;
  * @author 李俊
  * @version 2019-12-17
  */
-public class CmLogisticsRecord implements Serializable {
+public class CmMallLogisticsRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private Integer id;

src/main/java/com/caimei/entity/CmOperationUser.java → src/main/java/com/caimei/entity/CmMallOperationUser.java

@@ -3,7 +3,7 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.Date;
 
-public class CmOperationUser implements Serializable {
+public class CmMallOperationUser implements Serializable {
     private Integer id;
     private Integer userOrganizeID;      //具体对应cm_mall_organize表ID
     private Integer clubID;              //会所ID：隶属于哪个会所的运营人员

src/main/java/com/caimei/entity/CmOrder.java → src/main/java/com/caimei/entity/CmMallOrder.java

@@ -3,7 +3,7 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.List;
 
-public class CmOrder implements Serializable {
+public class CmMallOrder implements Serializable {
     private Integer orderID;        // orderID
     private String orderMark;        // 订单标识，例#orderID#：#1000#
     private String orderNo;        // 订单编号
@@ -59,7 +59,7 @@ public class CmOrder implements Serializable {
     private String payStatus;//(付款供应商)付款状态：1待付款、2部分付款、3已付款
     private String sendOutStatus;//发货状态：1待发货、2部分发货、3已发货
     private String refundType;//退货退款类型：1部分退、2全部退
-    private List<CmShopOrder> shopOrderList; //子订单集合
+    private List<CmMallShopOrder> shopOrderList; //子订单集合
     private Long autoCloseTimeMills; //订单自动取消时间 毫秒
     private Double receiptAmount;      //支付总金额
     private Double returnedPurchaseFee;     //退款总金额
@@ -520,11 +520,11 @@ public class CmOrder implements Serializable {
         this.refundType = refundType;
     }
 
-    public List<CmShopOrder> getShopOrderList() {
+    public List<CmMallShopOrder> getShopOrderList() {
         return shopOrderList;
     }
 
-    public void setShopOrderList(List<CmShopOrder> shopOrderList) {
+    public void setShopOrderList(List<CmMallShopOrder> shopOrderList) {
         this.shopOrderList = shopOrderList;
     }
 

src/main/java/com/caimei/entity/OrderInvoice.java → src/main/java/com/caimei/entity/CmMallOrderInvoice.java

@@ -5,7 +5,7 @@ import java.io.Serializable;
 /**
  * 订单发票信息
  */
-public class OrderInvoice implements Serializable {
+public class CmMallOrderInvoice implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Integer id;//ID

src/main/java/com/caimei/entity/CmOrderProduct.java → src/main/java/com/caimei/entity/CmMallOrderProduct.java

@@ -9,7 +9,7 @@ import java.util.List;
  * @author 李俊
  * @version 2019-12-17
  */
-public class CmOrderProduct implements Serializable {
+public class CmMallOrderProduct implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private Integer orderProductID;        // orderProductID

src/main/java/com/caimei/entity/CmOrganizeProducts.java → src/main/java/com/caimei/entity/CmMallOrganizeProducts.java

@@ -3,7 +3,7 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.List;
 
-public class CmOrganizeProducts implements Serializable {
+public class CmMallOrganizeProducts implements Serializable {
     private Integer id;
     private Integer classifyID;   //对应cm_mall_products_classify商品分类表id
     private Integer organizeID;    //组织ID,具体对应cm_mall_organize表ID
@@ -27,10 +27,10 @@ public class CmOrganizeProducts implements Serializable {
     private String unit;        //包装规格
     private Integer productCount;  //商品数量
     private Integer cartCount;   //购物车总数量
-    private Product product;    //采美商品表
-    private List<ProductImage> ProductImage;  //商品图片
-    private ProductDetailInfo productDetailInfo; //商品详情
-    private Shop shop;      //供应商信息
+    private CmMallProduct cmMallProduct;    //采美商品表
+    private List<CmMallProductImage> CmMallProductImage;  //商品图片
+    private CmMallProductDetailInfo cmMallProductDetailInfo; //商品详情
+    private CmMallShop cmMallShop;      //供应商信息
     private String shopName;        //商品名称
     private Integer shopID;//
     private String productClassifyName;//商品分类名字
@@ -205,36 +205,36 @@ public class CmOrganizeProducts implements Serializable {
         this.unit = unit;
     }
 
-    public Product getProduct() {
-        return product;
+    public CmMallProduct getCmMallProduct() {
+        return cmMallProduct;
     }
 
-    public void setProduct(Product product) {
-        this.product = product;
+    public void setCmMallProduct(CmMallProduct cmMallProduct) {
+        this.cmMallProduct = cmMallProduct;
     }
 
-    public List<com.caimei.entity.ProductImage> getProductImage() {
-        return ProductImage;
+    public List<CmMallProductImage> getCmMallProductImage() {
+        return CmMallProductImage;
     }
 
-    public void setProductImage(List<com.caimei.entity.ProductImage> productImage) {
-        ProductImage = productImage;
+    public void setCmMallProductImage(List<CmMallProductImage> cmMallProductImage) {
+        CmMallProductImage = cmMallProductImage;
     }
 
-    public ProductDetailInfo getProductDetailInfo() {
-        return productDetailInfo;
+    public CmMallProductDetailInfo getCmMallProductDetailInfo() {
+        return cmMallProductDetailInfo;
     }
 
-    public void setProductDetailInfo(ProductDetailInfo productDetailInfo) {
-        this.productDetailInfo = productDetailInfo;
+    public void setCmMallProductDetailInfo(CmMallProductDetailInfo cmMallProductDetailInfo) {
+        this.cmMallProductDetailInfo = cmMallProductDetailInfo;
     }
 
-    public Shop getShop() {
-        return shop;
+    public CmMallShop getCmMallShop() {
+        return cmMallShop;
     }
 
-    public void setShop(Shop shop) {
-        this.shop = shop;
+    public void setCmMallShop(CmMallShop cmMallShop) {
+        this.cmMallShop = cmMallShop;
     }
 
     public Integer getCartCount() {

src/main/java/com/caimei/entity/Page.java → src/main/java/com/caimei/entity/CmMallPage.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 
-public class Page<T> implements Serializable{
+public class CmMallPage<T> implements Serializable{
 	private static final long serialVersionUID = 1L;
 	private int index;//当前页码
 	private int pageSize;//每页大小
@@ -14,7 +14,7 @@ public class Page<T> implements Serializable{
     private boolean hasPreviousPage;//是否有前一页
 	List<T> results;//查询结果
 	
-	public Page(List<T> list){
+	public CmMallPage(List<T> list){
 		if(list instanceof com.github.pagehelper.Page){
 			com.github.pagehelper.Page<T> page = (com.github.pagehelper.Page<T>)list;
 			this.index = page.getPageNum();
@@ -32,7 +32,7 @@ public class Page<T> implements Serializable{
 		}
 	}
 	
-	public Page(int index, int pageSize, int totalRecord, List<T> results) {
+	public CmMallPage(int index, int pageSize, int totalRecord, List<T> results) {
 		super();
 		this.index = index;
 		this.pageSize = pageSize;
@@ -51,8 +51,8 @@ public class Page<T> implements Serializable{
 		}
 	}
 	
-	public Page(int index, int maxSize, int totalRecord, int totalPage,
-			List<T> results) {
+	public CmMallPage(int index, int maxSize, int totalRecord, int totalPage,
+                      List<T> results) {
 		super();
 		this.index = index;
 		this.pageSize = maxSize;
@@ -83,7 +83,7 @@ public class Page<T> implements Serializable{
 		}
 	}
 	
-	public Page() {
+	public CmMallPage() {
 		super();
 	}
 	public int getIndex() {

src/main/java/com/caimei/entity/CmPayShopRecord.java → src/main/java/com/caimei/entity/CmMallPayShopRecord.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class CmPayShopRecord implements Serializable {
+public class CmMallPayShopRecord implements Serializable {
     private Integer id;
     private String shopID;        // 供应商Id
     private String shopOrderID;        // 子订单ID

src/main/java/com/caimei/entity/Product.java → src/main/java/com/caimei/entity/CmMallProduct.java

@@ -3,7 +3,7 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.Date;
 
-public class Product implements Serializable {
+public class CmMallProduct implements Serializable {
     private Integer productID; //
     private Integer brandID; //品牌Id（使用cm_brand品牌表brand供应商品牌已废弃）
     private String brandName; //品牌名称

src/main/java/com/caimei/entity/ProductDetailInfo.java → src/main/java/com/caimei/entity/CmMallProductDetailInfo.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class ProductDetailInfo implements Serializable {
+public class CmMallProductDetailInfo implements Serializable {
     private Integer productDetailInfoID;
     private Integer productID;  //商品Id
     private String propValueAlias;

src/main/java/com/caimei/entity/ProductImage.java → src/main/java/com/caimei/entity/CmMallProductImage.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class ProductImage implements Serializable {
+public class CmMallProductImage implements Serializable {
     private Integer productImageID; //
     private Integer productID; //商品Id
     private Integer shopID; //商品对应供应商Id

src/main/java/com/caimei/entity/CmProductsClassify.java → src/main/java/com/caimei/entity/CmMallProductsClassify.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class CmProductsClassify implements Serializable {
+public class CmMallProductsClassify implements Serializable {
     private Integer id;
     private Integer organizeID;   //分类归属组织ID,具体对应cm_mall_organize表ID
     private String classifyName;  //分类名称

src/main/java/com/caimei/entity/Province.java → src/main/java/com/caimei/entity/CmMallProvince.java

@@ -4,13 +4,13 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.List;
 
-public class Province implements Serializable {
+public class CmMallProvince implements Serializable {
     private Long provinceid;
     private String name;        //名称
     private String validflag;   //是否可用，1可用
     private Float deliveryfee;  //运费
     private Float freemintotalprice;  //最低包邮金额
-    private List<City> citys;    //下面的市
+    private List<CmMallCity> cmMallCities;    //下面的市
 
     public Long getProvinceid() {
         return provinceid;
@@ -52,11 +52,11 @@ public class Province implements Serializable {
         this.freemintotalprice = freemintotalprice;
     }
 
-    public List<City> getCitys() {
-        return citys;
+    public List<CmMallCity> getCmMallCities() {
+        return cmMallCities;
     }
 
-    public void setCitys(List<City> citys) {
-        this.citys = citys;
+    public void setCmMallCities(List<CmMallCity> cmMallCities) {
+        this.cmMallCities = cmMallCities;
     }
 }

src/main/java/com/caimei/entity/CmReturnedPurchase.java → src/main/java/com/caimei/entity/CmMallReturnedPurchase.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
  * @author ye.qin
  * @version 2019-05-24
  */
-public class CmReturnedPurchase implements Serializable {
+public class CmMallReturnedPurchase implements Serializable {
 	private Integer id;
 	private String returnedNo;        // 退款退货编号
 	private Integer orderID;        // 主订单ID

src/main/java/com/caimei/entity/Router.java → src/main/java/com/caimei/entity/CmMallRouter.java

@@ -7,15 +7,15 @@ package com.caimei.entity;
  * @author 李俊
  * @version 2019-12-17
  */
-public class Router {
+public class CmMallRouter {
 
     private  String desc;//描述
     private  String time;//时间
 
-    public Router() {
+    public CmMallRouter() {
     }
 
-    public Router(String desc, String time) {
+    public CmMallRouter(String desc, String time) {
         this.desc = desc;
         this.time = time;
     }

src/main/java/com/caimei/entity/Shop.java → src/main/java/com/caimei/entity/CmMallShop.java

@@ -3,7 +3,7 @@ package com.caimei.entity;
 import java.io.Serializable;
 import java.util.List;
 
-public class Shop implements Serializable {
+public class CmMallShop implements Serializable {
     private Integer shopID; //
     private Integer userID; //
     private String name; //
@@ -84,7 +84,7 @@ public class Shop implements Serializable {
     private String medicalPracticeLicenseImg2;
     private String medicalPracticeLicenseImg3;
     private Double totalPrice;
-    private List<CmOrganizeProducts> productsList;  //商品集合
+    private List<CmMallOrganizeProducts> productsList;  //商品集合
     private Boolean checked = false; //勾选状态
     private Integer checkedCount = 0;  //商铺下商品选中数量
 
@@ -720,11 +720,11 @@ public class Shop implements Serializable {
         this.medicalPracticeLicenseImg3 = medicalPracticeLicenseImg3;
     }
 
-    public List<CmOrganizeProducts> getProductsList() {
+    public List<CmMallOrganizeProducts> getProductsList() {
         return productsList;
     }
 
-    public void setProductsList(List<CmOrganizeProducts> productsList) {
+    public void setProductsList(List<CmMallOrganizeProducts> productsList) {
         this.productsList = productsList;
     }
 

src/main/java/com/caimei/entity/CmShopOrder.java → src/main/java/com/caimei/entity/CmMallShopOrder.java

@@ -10,7 +10,7 @@ import java.util.List;
  * @author 李俊
  * @version 2019-12-17
  */
-public class CmShopOrder implements Serializable {
+public class CmMallShopOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private Integer shopOrderID;        // 子订单ID
@@ -57,11 +57,11 @@ public class CmShopOrder implements Serializable {
     private Integer outStoreNum;//已经发货的商品数量
     private Integer outStoreTimes;//第几批发货  default 0
     private Integer returnGoodsStatus;
-    private List<CmOrderProduct> cmOrderProducts; //订单商品信息
-    private UserInvoiceInfo orderInvoice;//订单发票信息
-    private List<LogisticsInfo> logisticsInfos;//订单快递信息
-    private List<CmLogisticsBatch> cmLogisticsBatches;//物流批次信息
-    private List<CmLogisticsRecord> cmLogisticsRecords; //发货物流记录
+    private List<CmMallOrderProduct> cmMallOrderProducts; //订单商品信息
+    private CmMallUserInvoiceInfo orderInvoice;//订单发票信息
+    private List<CmMallLogisticsInfo> cmMallLogisticsInfos;//订单快递信息
+    private List<CmMallLogisticsBatch> cmMallLogisticsBatches;//物流批次信息
+    private List<CmMallLogisticsRecord> cmMallLogisticsRecords; //发货物流记录
     private String payStatus;   //(付款供应商)付款状态：1待付款、2部分付款、3已付款'
     private String sendOutStatus;   //发货状态：1待发货、2部分发货、3已发货
     private Double shopProductAmount; //商品费
@@ -427,36 +427,36 @@ public class CmShopOrder implements Serializable {
         this.shopName = shopName;
     }
 
-    public List<CmOrderProduct> getCmOrderProducts() {
-        return cmOrderProducts;
+    public List<CmMallOrderProduct> getCmMallOrderProducts() {
+        return cmMallOrderProducts;
     }
 
-    public void setCmOrderProducts(List<CmOrderProduct> cmOrderProducts) {
-        this.cmOrderProducts = cmOrderProducts;
+    public void setCmMallOrderProducts(List<CmMallOrderProduct> cmMallOrderProducts) {
+        this.cmMallOrderProducts = cmMallOrderProducts;
     }
 
-    public UserInvoiceInfo getOrderInvoice() {
+    public CmMallUserInvoiceInfo getOrderInvoice() {
         return orderInvoice;
     }
 
-    public void setOrderInvoice(UserInvoiceInfo orderInvoice) {
+    public void setOrderInvoice(CmMallUserInvoiceInfo orderInvoice) {
         this.orderInvoice = orderInvoice;
     }
 
-    public List<LogisticsInfo> getLogisticsInfos() {
-        return logisticsInfos;
+    public List<CmMallLogisticsInfo> getCmMallLogisticsInfos() {
+        return cmMallLogisticsInfos;
     }
 
-    public void setLogisticsInfos(List<LogisticsInfo> logisticsInfos) {
-        this.logisticsInfos = logisticsInfos;
+    public void setCmMallLogisticsInfos(List<CmMallLogisticsInfo> cmMallLogisticsInfos) {
+        this.cmMallLogisticsInfos = cmMallLogisticsInfos;
     }
 
-    public List<CmLogisticsBatch> getCmLogisticsBatches() {
-        return cmLogisticsBatches;
+    public List<CmMallLogisticsBatch> getCmMallLogisticsBatches() {
+        return cmMallLogisticsBatches;
     }
 
-    public void setCmLogisticsBatches(List<CmLogisticsBatch> cmLogisticsBatches) {
-        this.cmLogisticsBatches = cmLogisticsBatches;
+    public void setCmMallLogisticsBatches(List<CmMallLogisticsBatch> cmMallLogisticsBatches) {
+        this.cmMallLogisticsBatches = cmMallLogisticsBatches;
     }
 
     public String getPayStatus() {
@@ -523,12 +523,12 @@ public class CmShopOrder implements Serializable {
         this.shopOtherFee = shopOtherFee;
     }
 
-    public List<CmLogisticsRecord> getCmLogisticsRecords() {
-        return cmLogisticsRecords;
+    public List<CmMallLogisticsRecord> getCmMallLogisticsRecords() {
+        return cmMallLogisticsRecords;
     }
 
-    public void setCmLogisticsRecords(List<CmLogisticsRecord> cmLogisticsRecords) {
-        this.cmLogisticsRecords = cmLogisticsRecords;
+    public void setCmMallLogisticsRecords(List<CmMallLogisticsRecord> cmMallLogisticsRecords) {
+        this.cmMallLogisticsRecords = cmMallLogisticsRecords;
     }
 
     public Integer getClubID() {

src/main/java/com/caimei/entity/Town.java → src/main/java/com/caimei/entity/CmMallTown.java

@@ -1,6 +1,6 @@
 package com.caimei.entity;
 
-public class Town {
+public class CmMallTown {
     private Integer townid; //
     private Integer cityid;  //所在城市Id
     private String name;  //名称

src/main/java/com/caimei/entity/User.java → src/main/java/com/caimei/entity/CmMallUser.java

@@ -6,7 +6,7 @@ import java.math.BigDecimal;
 /**
  * 用户实体类
  */
-public class User implements Serializable {
+public class CmMallUser implements Serializable {
     private static final long serialVersionUID = 1L;
     /**
      * 主键 userID

src/main/java/com/caimei/entity/CmUserBalanceRecord.java → src/main/java/com/caimei/entity/CmMallUserBalanceRecord.java

@@ -6,7 +6,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
 import java.util.Date;
 
-public class CmUserBalanceRecord implements Serializable {
+public class CmMallUserBalanceRecord implements Serializable {
     private Integer userId;        // 用户ID
     private Integer userOrganizeID;  //组织id
     private String type;        // 收支类型：1收入，2支出

src/main/java/com/caimei/entity/UserInvoiceInfo.java → src/main/java/com/caimei/entity/CmMallUserInvoiceInfo.java

@@ -2,7 +2,7 @@ package com.caimei.entity;
 
 import java.io.Serializable;
 
-public class UserInvoiceInfo implements Serializable {
+public class CmMallUserInvoiceInfo implements Serializable {
     private Integer id;//ID
     private Integer userId;
     private String invoiceTitle;        // 发票抬头 个人名称或企业名称

src/main/java/com/caimei/entity/WxJsonModel.java → src/main/java/com/caimei/entity/CmWxJsonModel.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 
 import java.io.Serializable;
 
-public class WxJsonModel implements Serializable {
+public class CmWxJsonModel implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -13,38 +13,38 @@ public class WxJsonModel implements Serializable {
     private Object data;        //返回结果
 
 
-    public static WxJsonModel newInstance() {
-        WxJsonModel jsonModel = new WxJsonModel();
+    public static CmWxJsonModel newInstance() {
+        CmWxJsonModel jsonModel = new CmWxJsonModel();
         return jsonModel.success();
     }
 
-    public WxJsonModel unLogin() {
+    public CmWxJsonModel unLogin() {
         this.setMsg("请先登录");
         this.setCode("1002");
         return this;
     }
 
-    public WxJsonModel success() {
+    public CmWxJsonModel success() {
         this.code = "1";
         this.msg = "操作成功";
         return this;
     }
 
-    public WxJsonModel success(Object data) {
+    public CmWxJsonModel success(Object data) {
         this.code = "1";
         this.msg = "操作成功";
         this.data = data;
         return this;
     }
 
-    public WxJsonModel success(String msg, Object data) {
+    public CmWxJsonModel success(String msg, Object data) {
         this.code = "1";
         this.msg = msg;
         this.data = data;
         return this;
     }
 
-    public WxJsonModel success(String code, Object data, String msg) {
+    public CmWxJsonModel success(String code, Object data, String msg) {
         this.code = code;
         this.msg = msg;
         this.data = data;
@@ -52,25 +52,25 @@ public class WxJsonModel implements Serializable {
     }
 
 
-    public WxJsonModel error() {
+    public CmWxJsonModel error() {
         this.code = "-1";
         this.msg = "操作失败";
         return this;
     }
 
-    public WxJsonModel error(String msg) {
+    public CmWxJsonModel error(String msg) {
         this.code = "-1";
         this.msg = msg;
         return this;
     }
 
-    public WxJsonModel error(String code, String msg) {
+    public CmWxJsonModel error(String code, String msg) {
         this.code = code;
         this.msg = msg;
         return this;
     }
 
-    public WxJsonModel error(String code, Object data, String msg) {
+    public CmWxJsonModel error(String code, Object data, String msg) {
         this.code = code;
         this.msg = msg;
         this.data = data;
@@ -103,7 +103,7 @@ public class WxJsonModel implements Serializable {
 
     @Override
     public String toString() {
-        return "WxJsonModel [code=" + code + ", msg=" + msg + ", data=" + data + "]";
+        return "CmWxJsonModel [code=" + code + ", msg=" + msg + ", data=" + data + "]";
     }
 
     public String toJsonString() {

src/main/java/com/caimei/mapper/order/BpUserInfoMapper.java

@@ -1,6 +1,6 @@
 package com.caimei.mapper.order;
 
-import com.caimei.entity.BpOrderUserInfo;
+import com.caimei.entity.CmMallBpOrderUserInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,11 +13,11 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface BpUserInfoMapper {
 
-    BpOrderUserInfo getUserInfo(@Param("orderId") Integer orderId);
+    CmMallBpOrderUserInfo getUserInfo(@Param("orderId") Integer orderId);
 
-    int insertUserInfo(BpOrderUserInfo bpOrderUserInfo);
+    int insertUserInfo(CmMallBpOrderUserInfo cmMallBpOrderUserInfo);
 
-    int updateUserInfo(BpOrderUserInfo bpOrderUserInfo);
+    int updateUserInfo(CmMallBpOrderUserInfo cmMallBpOrderUserInfo);
 
     int deleteUserInfo(@Param("orderId") Integer orderId);
 }

src/main/java/com/caimei/mapper/order/CmShopOrderMapper.java

@@ -1,6 +1,6 @@
 package com.caimei.mapper.order;
 
-import com.caimei.entity.CmShopOrder;
+import com.caimei.entity.CmMallShopOrder;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,29 +10,29 @@ import java.util.Map;
 @Mapper
 public interface CmShopOrderMapper {
 
-    List<CmShopOrder> findList(CmShopOrder cmShopOrder);
+    List<CmMallShopOrder> findList(CmMallShopOrder cmMallShopOrder);
 
     int delete(@Param("shopOrderID") Integer shopOrderID);
 
-    int update(CmShopOrder cmShopOrder);
+    int update(CmMallShopOrder cmMallShopOrder);
 
-    int delete(CmShopOrder cmShopOrder);
+    int delete(CmMallShopOrder cmMallShopOrder);
 
-    int insert(CmShopOrder cmShopOrder);
+    int insert(CmMallShopOrder cmMallShopOrder);
 
-    int insertCmShopOrder(CmShopOrder cmShopOrder);
+    int insertCmShopOrder(CmMallShopOrder cmMallShopOrder);
 
-    CmShopOrder get(@Param("shopOrderID") Integer shopOrderID);
+    CmMallShopOrder get(@Param("shopOrderID") Integer shopOrderID);
 
-    List<CmShopOrder> listShopOrderByIDs(@Param("shopOrderIDs") String shopOrderIDs);
+    List<CmMallShopOrder> listShopOrderByIDs(@Param("shopOrderIDs") String shopOrderIDs);
 
     int updateOrderOwner(Map<String, Object> param);
 
     int updateRefundsInfo(@Param("shopOrderID") Integer shopOrderID, @Param("orderStatusFlag") String orderStatusFlag);
 
-    CmShopOrder findByShopID(@Param("orderID") Integer orderID, @Param("shopID") Integer shopID);
+    CmMallShopOrder findByShopID(@Param("orderID") Integer orderID, @Param("shopID") Integer shopID);
 
-    List<CmShopOrder> findMaxShopOrderNo(@Param("orderID") Integer orderID);
+    List<CmMallShopOrder> findMaxShopOrderNo(@Param("orderID") Integer orderID);
 
     List<Map<String, Object>> countSupplierOrders(@Param("shopID") Integer shopID);
 
@@ -40,9 +40,9 @@ public interface CmShopOrderMapper {
 
     List<Map<String, Object>> salesStatistics(@Param("shopID") Integer shopID, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
-    int shopOrderBak(CmShopOrder cmShopOrder);
+    int shopOrderBak(CmMallShopOrder cmMallShopOrder);
 
-    List<CmShopOrder> findListByOrderID(@Param("orderID") Integer orderID);
+    List<CmMallShopOrder> findListByOrderID(@Param("orderID") Integer orderID);
 
     Double findTotalTaxByOrderID(Integer orderID);
 

src/main/java/com/caimei/mapper/order/OrderMapper.java

@@ -10,55 +10,55 @@ import java.util.Map;
 @Mapper
 public interface OrderMapper {
 
-    int insert(CmOrder cmOrder);
+    int insert(CmMallOrder cmMallOrder);
 
-    int update(CmOrder cmOrder);
+    int update(CmMallOrder cmMallOrder);
 
     OrderShareCode queryCode(Integer orderID);
 
-    FreePostageCard queryFree(Integer userId);
+    CmMallFreePostageCard queryFree(Integer userId);
 
     void updateCode(OrderShareCode orderShareCode);
 
     void insertCode(OrderShareCode code);
 
-    List<Shop> findShop(List<String> productIDs);
+    List<CmMallShop> findShop(List<String> productIDs);
 
-    List<CmOrganizeProducts> findAllCommodity(Map<String, Object> params);
+    List<CmMallOrganizeProducts> findAllCommodity(Map<String, Object> params);
 
-    CmOrganizeProducts findCommodity(@Param("productIDs") String productIDs, @Param("shopID") Integer shopID);
+    CmMallOrganizeProducts findCommodity(@Param("productIDs") String productIDs, @Param("shopID") Integer shopID);
 
-    BpOrderUserInfo findUserInfo(Integer orderID);
+    CmMallBpOrderUserInfo findUserInfo(Integer orderID);
 
-    CmOrder findOrder(Integer orderID);
+    CmMallOrder findOrder(Integer orderID);
 
-    List<CmShopOrder> findAllShopOrder(String[] shopOrderIDs);
+    List<CmMallShopOrder> findAllShopOrder(String[] shopOrderIDs);
 
-    List<CmOrderProduct> findOrderProduct(Integer shopOrderID);
+    List<CmMallOrderProduct> findOrderProduct(Integer shopOrderID);
 
-    List<CmDiscernReceipt> findDiscernReceipt(Integer orderID);
+    List<CmMallDiscernReceipt> findDiscernReceipt(Integer orderID);
 
-    List<CmReturnedPurchase> findReturnedPurchase(Integer orderID);
+    List<CmMallReturnedPurchase> findReturnedPurchase(Integer orderID);
 
-    List<LogisticsInfo> findLogisticsInfo(Integer logisticsBatchID);
+    List<CmMallLogisticsInfo> findLogisticsInfo(Integer logisticsBatchID);
 
-    List<CmLogisticsRecord> findLogisticsRecord(@Param("shopOrderID") Integer shopOrderID,@Param("logisticsBatchID") Integer logisticsBatchID);
+    List<CmMallLogisticsRecord> findLogisticsRecord(@Param("shopOrderID") Integer shopOrderID, @Param("logisticsBatchID") Integer logisticsBatchID);
 
     CmMallShareCodeRecord findShareCodeRecord(@Param("openid") String openid, @Param("orderID") Integer orderID);
 
     void saveShareCodeRecord(CmMallShareCodeRecord codeRecord);
 
-    List<CmOrder> findAllOrder(@Param("userID") Integer userID, @Param("orderState") Integer orderState, @Param("organizeID") Integer organizeID);
+    List<CmMallOrder> findAllOrder(@Param("userID") Integer userID, @Param("orderState") Integer orderState, @Param("organizeID") Integer organizeID);
 
     String findShareCode(Integer orderID);
 
-    List<CmOrganizeProducts> oftenPurchase(@Param("userID") Integer userID, @Param("organizeID") Integer organizeID);
+    List<CmMallOrganizeProducts> oftenPurchase(@Param("userID") Integer userID, @Param("organizeID") Integer organizeID);
 
     void deleteReceiptOrderRelation(Integer orderID);
 
     void deleteDiscernReceipt(Integer id);
 
-    List<CmPayShopRecord> findPayShopRecord(Integer shopOrderID);
+    List<CmMallPayShopRecord> findPayShopRecord(Integer shopOrderID);
 
     void deletePayShopRecord(Integer shopOrderID);
 
@@ -67,16 +67,16 @@ public interface OrderMapper {
     void updateLogisticsBatch(Integer orderID);
 
     //获取订单发票信息
-    OrderInvoice getOrderInvoice(@Param("orderId") Integer orderId);
+    CmMallOrderInvoice getOrderInvoice(@Param("orderId") Integer orderId);
 
     //保存订单发票信息
-    void insertOrderInvoice(OrderInvoice orderInvoice);
+    void insertOrderInvoice(CmMallOrderInvoice cmMallOrderInvoice);
 
     void deleteCodeRecord(Integer orderID);
 
     List<String> findShopOrderID(@Param("orderID") Integer orderID, @Param("id") Integer id);
 
-    List<CmLogisticsBatch> findLogistics(Integer orderID);
+    List<CmMallLogisticsBatch> findLogistics(Integer orderID);
 
-    CmProductsClassify findClassifyID(String classifyID);
+    CmMallProductsClassify findClassifyID(String classifyID);
 }

src/main/java/com/caimei/mapper/order/OrderProductMapper.java

@@ -1,6 +1,6 @@
 package com.caimei.mapper.order;
 
-import com.caimei.entity.CmOrderProduct;
+import com.caimei.entity.CmMallOrderProduct;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,38 +10,38 @@ import java.util.List;
 @Mapper
 public interface OrderProductMapper {
 
-    CmOrderProduct get(@Param("orderProductID") Integer orderProductID);
+    CmMallOrderProduct get(@Param("orderProductID") Integer orderProductID);
 
-    List<CmOrderProduct> findList(CmOrderProduct cmOrderProduct);
+    List<CmMallOrderProduct> findList(CmMallOrderProduct cmMallOrderProduct);
 
     int delete(@Param("orderProductID") Integer orderProductID);
 
-    int update(CmOrderProduct cmOrderProduct);
+    int update(CmMallOrderProduct cmMallOrderProduct);
 
-    int delete(CmOrderProduct cmOrderProduct);
+    int delete(CmMallOrderProduct cmMallOrderProduct);
 
-    int insert(CmOrderProduct cmOrderProduct);
+    int insert(CmMallOrderProduct cmMallOrderProduct);
 
-    List<CmOrderProduct> findByIds(String[] ids);
+    List<CmMallOrderProduct> findByIds(String[] ids);
 
-    List<CmOrderProduct> findByIdsAndOrderId(@Param("ids") String[] split, @Param("orderID") Integer orderId);
+    List<CmMallOrderProduct> findByIdsAndOrderId(@Param("ids") String[] split, @Param("orderID") Integer orderId);
 
-    List<CmOrderProduct> findByOrderIdGroupByShopId(@Param("orderID") Long orderId);
+    List<CmMallOrderProduct> findByOrderIdGroupByShopId(@Param("orderID") Long orderId);
 
-    List<CmOrderProduct> findByShopIdGroupByOrderId(@Param("shopID") Integer shopId);
+    List<CmMallOrderProduct> findByShopIdGroupByOrderId(@Param("shopID") Integer shopId);
 
     // 查询供应商都确认的订单商品的list
-    List<CmOrderProduct> findOrderProductGroup(@Param("shopID") Integer shopId);
+    List<CmMallOrderProduct> findOrderProductGroup(@Param("shopID") Integer shopId);
 
     int shopConfirmProduct(@Param("shopID") Integer shopId, @Param("orderID") Integer orderId);
 
     Integer getUnCommentNum(@Param("shopOrderID") Integer shopOrderID);
 
-    List<CmOrderProduct> getOrderProductDetail(@Param("shopOrderID") Integer shopOrderID);
+    List<CmMallOrderProduct> getOrderProductDetail(@Param("shopOrderID") Integer shopOrderID);
 
     String getIdsByOrderID(@Param("orderID") Integer orderID);
 
-    CmOrderProduct findByOrderProductID(@Param("orderProductID") Integer orderProductID);
+    CmMallOrderProduct findByOrderProductID(@Param("orderProductID") Integer orderProductID);
 
     Integer getReturningNum(@Param("orderProductID") Integer orderProductID);
 

src/main/java/com/caimei/mapper/products/DetailsMapper.java

@@ -7,15 +7,15 @@ import java.util.List;
 
 @Mapper
 public interface DetailsMapper {
-    CmOrganizeProducts findProduct(Integer id);
+    CmMallOrganizeProducts findProduct(Integer id);
 
-    Product product(Integer productID);
+    CmMallProduct product(Integer productID);
 
-    List<ProductImage> findAllProductImage(Integer productID);
+    List<CmMallProductImage> findAllProductImage(Integer productID);
 
-    ProductDetailInfo findProductDetail(Integer productID);
+    CmMallProductDetailInfo findProductDetail(Integer productID);
 
-    Shop findShop(Integer shopID);
+    CmMallShop findShop(Integer shopID);
 
     void saveCart(CmMallCart cmMallCart);
 

src/main/java/com/caimei/mapper/products/HomePageMapper.java

@@ -8,19 +8,19 @@ import java.util.List;
 @Mapper
 public interface HomePageMapper {
 
-    List<CmProductsClassify> findClassify(Integer organizeID);
+    List<CmMallProductsClassify> findClassify(Integer organizeID);
 
-    List<CmOrganizeProducts> findProducts(Integer organizeID);
+    List<CmMallOrganizeProducts> findProducts(Integer organizeID);
 
     Integer cartQuantity(Integer userID);
 
-    List<CmOrganizeProducts> classify(CmOrganizeProducts organizeProducts);
+    List<CmMallOrganizeProducts> classify(CmMallOrganizeProducts organizeProducts);
 
-    List<CmOrganizeProducts> preferred(CmOrganizeProducts organizeProducts);
+    List<CmMallOrganizeProducts> preferred(CmMallOrganizeProducts organizeProducts);
 
-    List<hospital> member();
+    List<CmMallHospital> member();
 
-    List<brand> findId(Integer id);
+    List<CmMallBrand> findId(Integer id);
 
     CmMallOrganize afterSale(Integer organizeID);
 

src/main/java/com/caimei/mapper/products/OrganizeProductsMapper.java

@@ -1,18 +1,18 @@
 package com.caimei.mapper.products;
 
-import com.caimei.entity.CmOrderProduct;
-import com.caimei.entity.CmOrganizeProducts;
-import com.caimei.entity.Product;
+import com.caimei.entity.CmMallOrderProduct;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallProduct;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface OrganizeProductsMapper {
-    CmOrganizeProducts selectProductById(@Param("id") Integer id);
+    CmMallOrganizeProducts selectProductById(@Param("id") Integer id);
 
-    Product selectCmProductById(@Param("productID") Integer productID);
+    CmMallProduct selectCmProductById(@Param("productID") Integer productID);
 
-    int insert(CmOrderProduct cmOrderProduct);
+    int insert(CmMallOrderProduct cmMallOrderProduct);
 
-    int update(CmOrderProduct cmOrderProduct);
+    int update(CmMallOrderProduct cmMallOrderProduct);
 }

src/main/java/com/caimei/mapper/products/ShoppingMapper.java

@@ -1,8 +1,8 @@
 package com.caimei.mapper.products;
 
 import com.caimei.entity.CmMallCart;
-import com.caimei.entity.CmOrganizeProducts;
-import com.caimei.entity.Shop;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallShop;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,9 +11,9 @@ import java.util.List;
 @Mapper
 public interface ShoppingMapper {
 
-    List<Shop> findAllShop(Integer userID);
+    List<CmMallShop> findAllShop(Integer userID);
 
-    List<CmOrganizeProducts> findAllProducts(@Param("shopID") Integer shopID, @Param("userID") Integer userID);
+    List<CmMallOrganizeProducts> findAllProducts(@Param("shopID") Integer shopID, @Param("userID") Integer userID);
 
     void updateNumber(CmMallCart cmMallCart);
 

src/main/java/com/caimei/mapper/user/AddressMapper.java

@@ -1,6 +1,6 @@
 package com.caimei.mapper.user;
 
-import com.caimei.entity.Address;
+import com.caimei.entity.CmMallAddress;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,11 +9,11 @@ import java.util.List;
 @Mapper
 public interface AddressMapper {
 
-    List<Address> findByUserId(Integer userID);
+    List<CmMallAddress> findByUserId(Integer userID);
 
-    List<Address> findByUserIdByAddress(Integer userID);
+    List<CmMallAddress> findByUserIdByAddress(Integer userID);
 
-    Address findByAddressID(@Param("addressID") Integer addressID);
+    CmMallAddress findByAddressID(@Param("addressID") Integer addressID);
 
     int updateIsDefault(@Param("addressID") Integer addressID);
 
@@ -21,9 +21,9 @@ public interface AddressMapper {
 
     int delete(@Param("addressID") Integer addressID);
 
-    int update(Address address);
+    int update(CmMallAddress cmMallAddress);
 
-    int insert(Address address);
+    int insert(CmMallAddress cmMallAddress);
 
     int updateUser(@Param("newUserID") Integer newUserID, @Param("oldUserId") Integer oldUserId);
 }

src/main/java/com/caimei/mapper/user/LoginMapper.java

@@ -1,21 +1,21 @@
 package com.caimei.mapper.user;
 
-import com.caimei.entity.CmOperationUser;
+import com.caimei.entity.CmMallOperationUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface LoginMapper {
 
-    CmOperationUser doLogin(@Param("openid") String openid, @Param("userOrganizeID") Integer userOrganizeID);
+    CmMallOperationUser doLogin(@Param("openid") String openid, @Param("userOrganizeID") Integer userOrganizeID);
 
-    CmOperationUser isEnabled(@Param("invitationCode") String invitationCode, @Param("userOrganizeID") Integer userOrganizeID);
+    CmMallOperationUser isEnabled(@Param("invitationCode") String invitationCode, @Param("userOrganizeID") Integer userOrganizeID);
 
-    void update(CmOperationUser operationUser);
+    void update(CmMallOperationUser operationUser);
 
-    CmOperationUser query(CmOperationUser operationUser);
+    CmMallOperationUser query(CmMallOperationUser operationUser);
 
-    void updateOperationUser(CmOperationUser user);
+    void updateOperationUser(CmMallOperationUser user);
 
     String cellPhone(Integer userOrganizeID);
 }

src/main/java/com/caimei/mapper/user/PersonalMapper.java

@@ -9,35 +9,35 @@ import java.util.List;
 @Mapper
 public interface PersonalMapper {
 
-    Club myCentre(CmOperationUser operationUser);
+    CmMallClub myCentre(CmMallOperationUser operationUser);
 
-    List<CmUserBalanceRecord> touchBalance(CmUserBalanceRecord balanceRecord);
+    List<CmMallUserBalanceRecord> touchBalance(CmMallUserBalanceRecord balanceRecord);
 
-    List<Province> findAllProvince();
+    List<CmMallProvince> findAllProvince();
 
-    List<City> findAllCity(Long provinceid);
+    List<CmMallCity> findAllCity(Long provinceid);
 
-    List<Town> findAllTown(Integer cityid);
+    List<CmMallTown> findAllTown(Integer cityid);
 
-    List<Address> findAddress(Integer userID);
+    List<CmMallAddress> findAddress(Integer userID);
 
-    Address findCantonal(Integer townID);
+    CmMallAddress findCantonal(Integer townID);
 
-    void saveAddress(Address address);
+    void saveAddress(CmMallAddress cmMallAddress);
 
-    void updateAddress(Address address);
+    void updateAddress(CmMallAddress cmMallAddress);
 
     void deleteAddress(Integer addressID);
 
-    Address findDefaultAddress(Integer userID);
+    CmMallAddress findDefaultAddress(Integer userID);
 
     Double ableUserMoney(Integer userId);
 
-    UserInvoiceInfo findInvoice(Integer userId);
+    CmMallUserInvoiceInfo findInvoice(Integer userId);
 
-    void invoice(UserInvoiceInfo userInvoiceInfo);
+    void invoice(CmMallUserInvoiceInfo cmMallUserInvoiceInfo);
 
-    void updateInvoice(UserInvoiceInfo userInvoiceInfo);
+    void updateInvoice(CmMallUserInvoiceInfo cmMallUserInvoiceInfo);
 
     Integer findOrderCount(@Param("userID") Integer userID, @Param("orderState") Integer orderState, @Param("organizeID") Integer organizeID);
 }

src/main/java/com/caimei/mapper/user/UserMapper.java

@@ -1,7 +1,7 @@
 package com.caimei.mapper.user;
 
-import com.caimei.entity.CmUserBalanceRecord;
-import com.caimei.entity.User;
+import com.caimei.entity.CmMallUserBalanceRecord;
+import com.caimei.entity.CmMallUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,31 +13,31 @@ public interface UserMapper {
 	 * @param userId
 	 * @return
 	 */
-	User findUserById(@Param("userId") Integer userId);
+	CmMallUser findUserById(@Param("userId") Integer userId);
 
 	/**
 	 * 更新用户可用余额
-	 * @param user
+	 * @param cmMallUser
 	 */
-    void updateAbleUserMoney(User user);
+    void updateAbleUserMoney(CmMallUser cmMallUser);
 
 	/**
 	 * 更新用户余额
-	 * @param user
+	 * @param cmMallUser
 	 */
-	void updateUserMoney(User user);
+	void updateUserMoney(CmMallUser cmMallUser);
 
 	/**
 	 * 插入用户余额使用记录
-	 * @param cmUserBalanceRecord
+	 * @param cmMallUserBalanceRecord
 	 * @return
 	 */
-	int insertUserBalanceRecord(CmUserBalanceRecord cmUserBalanceRecord);
+	int insertUserBalanceRecord(CmMallUserBalanceRecord cmMallUserBalanceRecord);
 
 	/**
 	 * 更新用户余额记录
-	 * @param cmUserBalanceRecord
+	 * @param cmMallUserBalanceRecord
 	 * @return
 	 */
-	int updateBalanceRecord(CmUserBalanceRecord cmUserBalanceRecord);
+	int updateBalanceRecord(CmMallUserBalanceRecord cmMallUserBalanceRecord);
 }

src/main/java/com/caimei/service/order/OrderService.java

@@ -12,17 +12,17 @@ public interface OrderService {
 
     Map<String, Object> particulars(Integer orderID) throws Exception;
 
-    List<CmLogisticsBatch> logistics(Integer orderID) throws Exception;
+    List<CmMallLogisticsBatch> logistics(Integer orderID) throws Exception;
 
-    WxJsonModel saveOrderInfo(WxJsonModel wxJsonModel, Integer userId, Integer organizeID, String cartType, Integer addressID, Object orderInfo, String balanceDeductionFlag, Double orderShouldPayFee, Integer cmOperationID);
+    CmWxJsonModel saveOrderInfo(CmWxJsonModel cmWxJsonModel, Integer userId, Integer organizeID, String cartType, Integer addressID, Object orderInfo, String balanceDeductionFlag, Double orderShouldPayFee, Integer cmOperationID);
 
-    WxJsonModel verifyShareCode(String shareCode, String openid, Integer orderID, Integer userID, Integer organizeID);
+    CmWxJsonModel verifyShareCode(String shareCode, String openid, Integer orderID, Integer userID, Integer organizeID);
 
-    List<CmOrder> myOrder(Integer userID, Integer orderState, Integer organizeID);
+    List<CmMallOrder> myOrder(Integer userID, Integer orderState, Integer organizeID);
 
     Map<String, Object> oftenPurchase(Integer userID, Integer organizeID, Integer index, Integer pageSize);
 
-    WxJsonModel deleteOrder(Integer orderID);
+    CmWxJsonModel deleteOrder(Integer orderID);
 
     void cancelOrder(Integer orderID) throws Exception;
 

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

@@ -18,7 +18,6 @@ import com.caimei.utils.AppUtils;
 import com.caimei.utils.MathUtil;
 import com.caimei.utils.NoUtils;
 import com.github.pagehelper.PageHelper;
-import groovy.util.IFileNameFinder;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -74,44 +73,44 @@ public class OrderServiceImpl implements OrderService {
         } else {
             list.add(productIDs);
         }
-        List<Shop> shopList = orderMapper.findShop(list);
-        for (Shop shop : shopList) {
-            List<CmOrganizeProducts> productsList = new ArrayList();
+        List<CmMallShop> cmMallShopList = orderMapper.findShop(list);
+        for (CmMallShop cmMallShop : cmMallShopList) {
+            List<CmMallOrganizeProducts> productsList = new ArrayList();
             Double totalPrice = 0d;
             if (count == null) {
                 //购物车购买
                 Map<String, Object> params = new HashMap();
                 params.put("productIDs", list);
-                params.put("shopID", shop.getShopID());
+                params.put("shopID", cmMallShop.getShopID());
                 params.put("userId", userId);
                 productsList = orderMapper.findAllCommodity(params);
-                for (CmOrganizeProducts products : productsList) {
+                for (CmMallOrganizeProducts products : productsList) {
                     products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
                     totalPrice += products.getRetailPrice() * products.getProductCount();
                 }
             } else {
                 //立即购买
-                CmOrganizeProducts products = orderMapper.findCommodity(productIDs, shop.getShopID());
+                CmMallOrganizeProducts products = orderMapper.findCommodity(productIDs, cmMallShop.getShopID());
                 products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
                 products.setProductCount(count);
                 totalPrice = products.getRetailPrice() * products.getProductCount();
                 productsList.add(products);
             }
-            shop.setLogo(AppUtils.getImageURL("shopLogo", shop.getLogo(), 0, domain));
-            shop.setTotalPrice(totalPrice);
-            shop.setProductsList(productsList);
+            cmMallShop.setLogo(AppUtils.getImageURL("shopLogo", cmMallShop.getLogo(), 0, domain));
+            cmMallShop.setTotalPrice(totalPrice);
+            cmMallShop.setProductsList(productsList);
         }
         //发票信息
-        UserInvoiceInfo invoice = personalMapper.findInvoice(userId);
+        CmMallUserInvoiceInfo invoice = personalMapper.findInvoice(userId);
         //运费
-        FreePostageCard freePostageCard = orderMapper.queryFree(userId);
+        CmMallFreePostageCard cmMallFreePostageCard = orderMapper.queryFree(userId);
         //-1到付，0包邮,-2仪器到付其它包邮
         boolean pinkage = true;//判断是否全部包邮
         boolean collect = true;//判断是否全部到付
         if (classifyIDS.contains(",")) {
             for (String classifyID : classifyIDS.split(",")) {
                 if (classifyID != null && !classifyID.equals("")) {
-                    CmProductsClassify productsClassify = orderMapper.findClassifyID(classifyID);
+                    CmMallProductsClassify productsClassify = orderMapper.findClassifyID(classifyID);
                     if (productsClassify.getPostageToPay().equals("1")) {
                         pinkage = false;
                     } else {
@@ -120,7 +119,7 @@ public class OrderServiceImpl implements OrderService {
                 }
             }
         } else {
-            CmProductsClassify productsClassify = orderMapper.findClassifyID(classifyIDS);
+            CmMallProductsClassify productsClassify = orderMapper.findClassifyID(classifyIDS);
             if (productsClassify.getPostageToPay().equals("1")) {
                 pinkage = false;
             } else {
@@ -128,9 +127,9 @@ public class OrderServiceImpl implements OrderService {
             }
         }
         String freight = "";
-        if (pinkage && freePostageCard != null) {
+        if (pinkage && cmMallFreePostageCard != null) {
             freight = "0";
-        } else if (collect || pinkage || freePostageCard == null) {
+        } else if (collect || pinkage || cmMallFreePostageCard == null) {
             freight = "-1";
         } else {
             freight = "-2";
@@ -140,7 +139,7 @@ public class OrderServiceImpl implements OrderService {
         //可用余额
         Double userMoney = personalMapper.ableUserMoney(userId);
         if (userMoney == null) userMoney = 0d;
-        map.put("shopList", shopList);
+        map.put("cmMallShopList", cmMallShopList);
         map.put("invoice", invoice);
         map.put("freight", freight);
         map.put("cellPhone", cellPhone);
@@ -150,7 +149,7 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     public String shareOrder(Integer orderID) throws Exception {
-        CmOrder order = orderMapper.findOrder(orderID);
+        CmMallOrder order = orderMapper.findOrder(orderID);
         if (order == null) throw new Exception("订单不存在");
         OrderShareCode orderShareCode = orderMapper.queryCode(orderID);
         //生成分享码
@@ -181,12 +180,12 @@ public class OrderServiceImpl implements OrderService {
     }
 
     @Override
-    public WxJsonModel verifyShareCode(String shareCode, String openid, Integer orderID, Integer userID,
-                                       Integer organizeID) {
-        WxJsonModel model = WxJsonModel.newInstance();
-        CmOrder order = orderMapper.findOrder(orderID);
+    public CmWxJsonModel verifyShareCode(String shareCode, String openid, Integer orderID, Integer userID,
+                                         Integer organizeID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        CmMallOrder order = orderMapper.findOrder(orderID);
         if (order == null) return model.error("-2", "该订单已删除");
-        CmOperationUser operationUser = loginMapper.doLogin(openid, organizeID);
+        CmMallOperationUser operationUser = loginMapper.doLogin(openid, organizeID);
         if (operationUser != null && operationUser.getUserID().equals(userID)) {
             return model.success(true);
         }
@@ -216,9 +215,9 @@ public class OrderServiceImpl implements OrderService {
     public Map<String, Object> particulars(Integer orderID) throws Exception {
         Map<String, Object> map = new HashMap();
         //收货地址
-        BpOrderUserInfo userInfo = orderMapper.findUserInfo(orderID);
+        CmMallBpOrderUserInfo userInfo = orderMapper.findUserInfo(orderID);
         //订单信息,运费
-        CmOrder order = orderMapper.findOrder(orderID);
+        CmMallOrder order = orderMapper.findOrder(orderID);
         if (order == null) throw new Exception("该订单已删除");
         order.setOrderMark("#" + order.getOrderID() + "#");
         //111,待付待收待发
@@ -226,7 +225,7 @@ public class OrderServiceImpl implements OrderService {
             order.setStatus(111);
         }
         //判断交易全退情况下,是否发过货,77,交易全退可以查看物流
-        List<CmLogisticsBatch> batchList = orderMapper.findLogistics(orderID);
+        List<CmMallLogisticsBatch> batchList = orderMapper.findLogistics(orderID);
         if (order.getStatus().equals(7) && batchList != null && batchList.size() > 0) {
             order.setStatus(77);
         }
@@ -237,32 +236,32 @@ public class OrderServiceImpl implements OrderService {
         } else {
             ShopOrderIDs = new String[]{order.getShopOrderIDs()};
         }
-        List<CmShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
-        for (CmShopOrder shopOrder : shopOrderList) {
-            List<CmOrderProduct> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderID());
-            for (CmOrderProduct orderProduct : orderProductList) {
+        List<CmMallShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
+        for (CmMallShopOrder shopOrder : shopOrderList) {
+            List<CmMallOrderProduct> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderID());
+            for (CmMallOrderProduct orderProduct : orderProductList) {
                 orderProduct.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
             }
-            shopOrder.setCmOrderProducts(orderProductList);
+            shopOrder.setCmMallOrderProducts(orderProductList);
             shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
         }
         //发票信息
-        OrderInvoice orderInvoice = orderMapper.getOrderInvoice(orderID);
+        CmMallOrderInvoice cmMallOrderInvoice = orderMapper.getOrderInvoice(orderID);
         //支付记录
-        List<CmDiscernReceipt> discernReceiptList = orderMapper.findDiscernReceipt(orderID);
+        List<CmMallDiscernReceipt> discernReceiptList = orderMapper.findDiscernReceipt(orderID);
         if (discernReceiptList != null && discernReceiptList.size() > 0) {
             Double receiptAmount = 0d;
-            for (CmDiscernReceipt discernReceipt : discernReceiptList) {
+            for (CmMallDiscernReceipt discernReceipt : discernReceiptList) {
                 receiptAmount += discernReceipt.getAssociateAmount();
             }
             //支付总金额
             order.setReceiptAmount(receiptAmount);
         }
         //退款记录
-        List<CmReturnedPurchase> returnedPurchaseList = orderMapper.findReturnedPurchase(order.getOrderID());
+        List<CmMallReturnedPurchase> returnedPurchaseList = orderMapper.findReturnedPurchase(order.getOrderID());
         if (returnedPurchaseList != null && returnedPurchaseList.size() > 0) {
             Double returnedPurchaseFee = 0d;
-            for (CmReturnedPurchase returnedPurchase : returnedPurchaseList) {
+            for (CmMallReturnedPurchase returnedPurchase : returnedPurchaseList) {
                 returnedPurchaseFee += returnedPurchase.getRefundFee();
             }
             //退款总金额
@@ -275,7 +274,7 @@ public class OrderServiceImpl implements OrderService {
         map.put("order", order);
         map.put("userInfo", userInfo);
         map.put("shopOrderList", shopOrderList);
-        map.put("orderInvoice", orderInvoice);
+        map.put("cmMallOrderInvoice", cmMallOrderInvoice);
         map.put("discernReceiptList", discernReceiptList);
         map.put("returnedPurchaseList", returnedPurchaseList);
         map.put("cellPhone", cellPhone);
@@ -285,20 +284,20 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     @Transactional
-    public WxJsonModel saveOrderInfo(WxJsonModel wxJsonModel, Integer userId, Integer organizeID, String cartType, Integer addressID, Object orderInfo, String balanceDeductionFlag, Double orderShouldPayFee, Integer cmOperationID) {
+    public CmWxJsonModel saveOrderInfo(CmWxJsonModel cmWxJsonModel, Integer userId, Integer organizeID, String cartType, Integer addressID, Object orderInfo, String balanceDeductionFlag, Double orderShouldPayFee, Integer cmOperationID) {
         /**获取用户信息*/
-        User user = userMapper.findUserById(userId);
+        CmMallUser cmMallUser = userMapper.findUserById(userId);
         /**获取用户包邮卡*/
-        FreePostageCard freePostageCard = orderMapper.queryFree(userId);
-        if (null == user) {
-            return wxJsonModel.error("-1", "用户账户异常");
+        CmMallFreePostageCard cmMallFreePostageCard = orderMapper.queryFree(userId);
+        if (null == cmMallUser) {
+            return cmWxJsonModel.error("-1", "用户账户异常");
         }
-        Integer clubID = user.getClubID();
+        Integer clubID = cmMallUser.getClubID();
         boolean isIncludedInstruments = false;//是否包含仪器(默认不包含仪器)
         boolean isIncludedProduct = false;//是否包含商品(默认不包含仪器)
         boolean isPaySuccessFlag = false;//是完成支付(默认不是，只有余额抵扣才算)
-        CmOrder cmOrder = new CmOrder();
-        List<CmOrderProduct> orderProductList = new ArrayList<>();//整理订单商品列表
+        CmMallOrder cmMallOrder = new CmMallOrder();
+        List<CmMallOrderProduct> orderProductList = new ArrayList<>();//整理订单商品列表
         HashMap<Integer, String> shopIDs = new HashMap<>();
         Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -317,8 +316,8 @@ public class OrderServiceImpl implements OrderService {
                 Integer shopId = (Integer) shopOrderInfo.get("shopId");
                 String note = (String) shopOrderInfo.get("note");
                 Object productInfo = shopOrderInfo.get("productInfo");//一个子订单对应的商品信息
-                if (null == shopId) return wxJsonModel.error("-1", "供应商数据异常");
-                if (null == productInfo) return wxJsonModel.error("-1", "订单商品数据异常");
+                if (null == shopId) return cmWxJsonModel.error("-1", "供应商数据异常");
+                if (null == productInfo) return cmWxJsonModel.error("-1", "订单商品数据异常");
                 shopIDs.put(shopId, note);
 
                 /**获取子订单商品信息*/
@@ -330,99 +329,99 @@ public class OrderServiceImpl implements OrderService {
                         //统计商品总数量
                         productCount += productNum;
                         //获取商品信息
-                        CmOrganizeProducts cmOrganizeProducts = organizeProductsMapper.selectProductById(productId);
-                        if (null == cmOrganizeProducts) return wxJsonModel.error("-1", "订单商品数据异常");
-                        if (null == productNum || productNum == 0) return wxJsonModel.error("-1", "商品购买数量异常");
-                        Product cmProduct = organizeProductsMapper.selectCmProductById(cmOrganizeProducts.getProductID());
-                        Double retailPrice = cmOrganizeProducts.getRetailPrice();//售价
-//                        Integer classifyID = cmOrganizeProducts.getClassifyID();
+                        CmMallOrganizeProducts cmMallOrganizeProducts = organizeProductsMapper.selectProductById(productId);
+                        if (null == cmMallOrganizeProducts) return cmWxJsonModel.error("-1", "订单商品数据异常");
+                        if (null == productNum || productNum == 0) return cmWxJsonModel.error("-1", "商品购买数量异常");
+                        CmMallProduct cmCmMallProduct = organizeProductsMapper.selectCmProductById(cmMallOrganizeProducts.getProductID());
+                        Double retailPrice = cmMallOrganizeProducts.getRetailPrice();//售价
+//                        Integer classifyID = cmMallOrganizeProducts.getClassifyID();
                         double productFee = retailPrice * productNum;//单个商品的金额
                         //统计商品总金额
                         productTotalFee += productFee;
-                        if (StringUtils.equals("1", cmOrganizeProducts.getPostageToPay()) && !isIncludedInstruments) {//判断是否存在仪器
+                        if (StringUtils.equals("1", cmMallOrganizeProducts.getPostageToPay()) && !isIncludedInstruments) {//判断是否存在仪器
                             isIncludedInstruments = true;
                         }
-                        if (!StringUtils.equals("1", cmOrganizeProducts.getPostageToPay()) && !isIncludedProduct) {//判断是否存在商品
+                        if (!StringUtils.equals("1", cmMallOrganizeProducts.getPostageToPay()) && !isIncludedProduct) {//判断是否存在商品
                             isIncludedProduct = true;
                         }
 
                         /**整理订单商品集合数据*/
-                        CmOrderProduct cmOrderProduct = new CmOrderProduct();
-                        cmOrderProduct.setShopID(cmOrganizeProducts.getShopID());
-                        cmOrderProduct.setProductID(cmOrganizeProducts.getProductID());//此处保存采美库商品Id
-                        cmOrderProduct.setOrganizeProductID(cmOrganizeProducts.getId());
-                        cmOrderProduct.setOrganizeID(organizeID);
+                        CmMallOrderProduct cmMallOrderProduct = new CmMallOrderProduct();
+                        cmMallOrderProduct.setShopID(cmMallOrganizeProducts.getShopID());
+                        cmMallOrderProduct.setProductID(cmMallOrganizeProducts.getProductID());//此处保存采美库商品Id
+                        cmMallOrderProduct.setOrganizeProductID(cmMallOrganizeProducts.getId());
+                        cmMallOrderProduct.setOrganizeID(organizeID);
                         //预留在保存保存子订单的时候添加
-                        cmOrderProduct.setProductNo(null);
-                        cmOrderProduct.setNum(productNum);
-                        cmOrderProduct.setPresentNum(0);
-                        cmOrderProduct.setPrice(retailPrice);
-                        cmOrderProduct.setProductUnit(cmProduct.getUnit());
-                        cmOrderProduct.setNormalPrice(cmOrganizeProducts.getNormalPrice());
-                        cmOrderProduct.setCostPrice(cmOrganizeProducts.getCostPrice());
-                        cmOrderProduct.setShopProductAmount(cmOrganizeProducts.getCostPrice() * productNum);//商品费=成本价快照*(购买数量  + 赠品数量)
-                        cmOrderProduct.setPrice0(retailPrice);
-                        cmOrderProduct.setPrice1(retailPrice);
-                        cmOrderProduct.setTaxRate(0d);
-                        cmOrderProduct.setAddedValueTax(0d);
-                        cmOrderProduct.setTotalAddedValueTax(0d);
-                        cmOrderProduct.setShopFee(cmOrganizeProducts.getCostPrice() * productNum);//应付供应商=成本价 * 商品数量
-                        cmOrderProduct.setSingleShopFee(cmOrganizeProducts.getCostPrice());
-                        cmOrderProduct.setOtherFee(0d);
-                        cmOrderProduct.setSingleOtherFee(0d);
-                        cmOrderProduct.setCmFee((cmOrganizeProducts.getRetailPrice() * productNum) - (cmOrganizeProducts.getCostPrice() * productNum));//应付采美=应付金额(应收金额)-应付供应商-应付第三方0-税费0）
-                        cmOrderProduct.setSingleCmFee(cmOrganizeProducts.getRetailPrice() - cmOrganizeProducts.getCostPrice());
-                        cmOrderProduct.setTotalAmount(cmOrganizeProducts.getRetailPrice() * productNum);
-                        cmOrderProduct.setTotalFee(cmOrganizeProducts.getRetailPrice() * productNum);
-                        cmOrderProduct.setShouldPayFee(cmOrganizeProducts.getRetailPrice() * productNum);
-                        cmOrderProduct.setTotalBeans(0d);
-                        cmOrderProduct.setUseBalanceAmount(0d);
-                        cmOrderProduct.setDiscountFee(0D);//经理折扣 优惠金额
-                        cmOrderProduct.setPreferential(0d);//优惠金额
-                        cmOrderProduct.setUseBalanceAmount(0d);
-                        cmOrderProduct.setConfirmProductFlag("0");//订单商品供应商确认标志 0否 1是
-                        cmOrderProduct.setDiscount(100d);
-                        cmOrderProduct.setDiscountPrice(cmOrganizeProducts.getRetailPrice());
-                        cmOrderProduct.setShopName(cmOrganizeProducts.getShopName());
-                        cmOrderProduct.setName(cmProduct.getName());
-                        cmOrderProduct.setPayStatus("0");
-                        cmOrderProduct.setBuyAgainFlag("0");
-                        cmOrderProduct.setNotOutStore(productNum); // 未出库数量
-                        cmOrderProduct.setCommentFlag("0");//是否已评论 1 是 0 未评论
-                        cmOrderProduct.setActPreferential(0d);
-                        cmOrderProduct.setActType(null);
-                        cmOrderProduct.setIsActProduct("0");//非活动商品
-                        cmOrderProduct.setProductImage(AppUtils.getImageURL("product", cmProduct.getMainImage(), 0, domain));
-                        orderProductList.add(cmOrderProduct);
+                        cmMallOrderProduct.setProductNo(null);
+                        cmMallOrderProduct.setNum(productNum);
+                        cmMallOrderProduct.setPresentNum(0);
+                        cmMallOrderProduct.setPrice(retailPrice);
+                        cmMallOrderProduct.setProductUnit(cmCmMallProduct.getUnit());
+                        cmMallOrderProduct.setNormalPrice(cmMallOrganizeProducts.getNormalPrice());
+                        cmMallOrderProduct.setCostPrice(cmMallOrganizeProducts.getCostPrice());
+                        cmMallOrderProduct.setShopProductAmount(cmMallOrganizeProducts.getCostPrice() * productNum);//商品费=成本价快照*(购买数量  + 赠品数量)
+                        cmMallOrderProduct.setPrice0(retailPrice);
+                        cmMallOrderProduct.setPrice1(retailPrice);
+                        cmMallOrderProduct.setTaxRate(0d);
+                        cmMallOrderProduct.setAddedValueTax(0d);
+                        cmMallOrderProduct.setTotalAddedValueTax(0d);
+                        cmMallOrderProduct.setShopFee(cmMallOrganizeProducts.getCostPrice() * productNum);//应付供应商=成本价 * 商品数量
+                        cmMallOrderProduct.setSingleShopFee(cmMallOrganizeProducts.getCostPrice());
+                        cmMallOrderProduct.setOtherFee(0d);
+                        cmMallOrderProduct.setSingleOtherFee(0d);
+                        cmMallOrderProduct.setCmFee((cmMallOrganizeProducts.getRetailPrice() * productNum) - (cmMallOrganizeProducts.getCostPrice() * productNum));//应付采美=应付金额(应收金额)-应付供应商-应付第三方0-税费0）
+                        cmMallOrderProduct.setSingleCmFee(cmMallOrganizeProducts.getRetailPrice() - cmMallOrganizeProducts.getCostPrice());
+                        cmMallOrderProduct.setTotalAmount(cmMallOrganizeProducts.getRetailPrice() * productNum);
+                        cmMallOrderProduct.setTotalFee(cmMallOrganizeProducts.getRetailPrice() * productNum);
+                        cmMallOrderProduct.setShouldPayFee(cmMallOrganizeProducts.getRetailPrice() * productNum);
+                        cmMallOrderProduct.setTotalBeans(0d);
+                        cmMallOrderProduct.setUseBalanceAmount(0d);
+                        cmMallOrderProduct.setDiscountFee(0D);//经理折扣 优惠金额
+                        cmMallOrderProduct.setPreferential(0d);//优惠金额
+                        cmMallOrderProduct.setUseBalanceAmount(0d);
+                        cmMallOrderProduct.setConfirmProductFlag("0");//订单商品供应商确认标志 0否 1是
+                        cmMallOrderProduct.setDiscount(100d);
+                        cmMallOrderProduct.setDiscountPrice(cmMallOrganizeProducts.getRetailPrice());
+                        cmMallOrderProduct.setShopName(cmMallOrganizeProducts.getShopName());
+                        cmMallOrderProduct.setName(cmCmMallProduct.getName());
+                        cmMallOrderProduct.setPayStatus("0");
+                        cmMallOrderProduct.setBuyAgainFlag("0");
+                        cmMallOrderProduct.setNotOutStore(productNum); // 未出库数量
+                        cmMallOrderProduct.setCommentFlag("0");//是否已评论 1 是 0 未评论
+                        cmMallOrderProduct.setActPreferential(0d);
+                        cmMallOrderProduct.setActType(null);
+                        cmMallOrderProduct.setIsActProduct("0");//非活动商品
+                        cmMallOrderProduct.setProductImage(AppUtils.getImageURL("product", cmCmMallProduct.getMainImage(), 0, domain));
+                        orderProductList.add(cmMallOrderProduct);
                     }
                 }
             }
 
             /**判断免邮标志*/
             if (isIncludedInstruments) {//包括仪器
-                if (isIncludedProduct && null != freePostageCard) {//包含商品且有包邮卡
-                    cmOrder.setFreePostFlag("-2");//免邮标志：-1到付，0包邮，1需要运费,-2仪器到付其它包邮【小程序只存在-1,0,-2】
-                    cmOrder.setFreight(-2d);
+                if (isIncludedProduct && null != cmMallFreePostageCard) {//包含商品且有包邮卡
+                    cmMallOrder.setFreePostFlag("-2");//免邮标志：-1到付，0包邮，1需要运费,-2仪器到付其它包邮【小程序只存在-1,0,-2】
+                    cmMallOrder.setFreight(-2d);
                 } else {//（1包含商品无包邮卡，2不包含商品）
-                    cmOrder.setFreePostFlag("-1");
-                    cmOrder.setFreight(-1d);
+                    cmMallOrder.setFreePostFlag("-1");
+                    cmMallOrder.setFreight(-1d);
                 }
             } else {//不包括仪器
-                if (isIncludedProduct && null != freePostageCard) {//无仪器包含商品且有包邮卡
-                    cmOrder.setFreePostFlag("0");//免邮标志：-1到付，0包邮，1需要运费,-2仪器到付其它包邮【小程序只存在-1,0,-2】
-                    cmOrder.setFreight(0d);
+                if (isIncludedProduct && null != cmMallFreePostageCard) {//无仪器包含商品且有包邮卡
+                    cmMallOrder.setFreePostFlag("0");//免邮标志：-1到付，0包邮，1需要运费,-2仪器到付其它包邮【小程序只存在-1,0,-2】
+                    cmMallOrder.setFreight(0d);
                 } else {//（1无仪器包含商品无包邮卡）
-                    cmOrder.setFreePostFlag("-1");
-                    cmOrder.setFreight(-1d);
+                    cmMallOrder.setFreePostFlag("-1");
+                    cmMallOrder.setFreight(-1d);
                 }
             }
 
             /**统计订单应付总金额*/
             payTotalFee = productTotalFee;
             BigDecimal bdPayTotalFee = new BigDecimal(payTotalFee);
-            cmOrder.setStatus(11);//待收款待发货(设置初始化状态)
-            cmOrder.setReceiptStatus("1");//（收款买家）收款状态：1待收款、2部分收款、3已收款(设置初始化状态)
-            cmOrder.setPayFlag("0");//是否已支付 未支付0 已支付1(设置初始化状态)
+            cmMallOrder.setStatus(11);//待收款待发货(设置初始化状态)
+            cmMallOrder.setReceiptStatus("1");//（收款买家）收款状态：1待收款、2部分收款、3已收款(设置初始化状态)
+            cmMallOrder.setPayFlag("0");//是否已支付 未支付0 已支付1(设置初始化状态)
 
             /**判断余额使用*/
             boolean useBalanceFlag = false;//默认不适用余额
@@ -436,34 +435,34 @@ public class OrderServiceImpl implements OrderService {
                     if (payTotalFee > userMoney) {//部分抵扣
                         balancePayFee = userMoney;
                         payableAmount = bdPayTotalFee.subtract(bdUserMoney);
-                        user.setUserMoney(new BigDecimal(0));//余额抵扣用完
-                        user.setAbleUserMoney(new BigDecimal(0));//余额抵扣用完
-                        userMapper.updateUserMoney(user);
-                        userMapper.updateAbleUserMoney(user);
-                        cmOrder.setStatus(21);//部收款待发货
-                        cmOrder.setReceiptStatus("2");
+                        cmMallUser.setUserMoney(new BigDecimal(0));//余额抵扣用完
+                        cmMallUser.setAbleUserMoney(new BigDecimal(0));//余额抵扣用完
+                        userMapper.updateUserMoney(cmMallUser);
+                        userMapper.updateAbleUserMoney(cmMallUser);
+                        cmMallOrder.setStatus(21);//部收款待发货
+                        cmMallOrder.setReceiptStatus("2");
                     } else if (payTotalFee < userMoney) {//全部用余额抵扣，无需直接，直接变成支付完成
                         balancePayFee = payTotalFee;
-                        user.setAbleUserMoney(bdUserMoney.subtract(bdPayTotalFee));
-                        user.setUserMoney(bdUserMoney.subtract(bdPayTotalFee));
-                        userMapper.updateAbleUserMoney(user);
-                        userMapper.updateUserMoney(user);
-                        cmOrder.setStatus(31);//已收款待发货
-                        cmOrder.setReceiptStatus("3");
-                        cmOrder.setPayFlag("1");
+                        cmMallUser.setAbleUserMoney(bdUserMoney.subtract(bdPayTotalFee));
+                        cmMallUser.setUserMoney(bdUserMoney.subtract(bdPayTotalFee));
+                        userMapper.updateAbleUserMoney(cmMallUser);
+                        userMapper.updateUserMoney(cmMallUser);
+                        cmMallOrder.setStatus(31);//已收款待发货
+                        cmMallOrder.setReceiptStatus("3");
+                        cmMallOrder.setPayFlag("1");
                         isPaySuccessFlag = true;
                     } else if (payTotalFee == userMoney) {//刚好抵扣完
                         balancePayFee = payTotalFee;
-                        user.setAbleUserMoney(new BigDecimal(0));
-                        user.setUserMoney(new BigDecimal(0));
-                        userMapper.updateAbleUserMoney(user);
-                        userMapper.updateUserMoney(user);
-                        cmOrder.setStatus(31);//已收款待发货
-                        cmOrder.setReceiptStatus("3");
-                        cmOrder.setPayFlag("1");
+                        cmMallUser.setAbleUserMoney(new BigDecimal(0));
+                        cmMallUser.setUserMoney(new BigDecimal(0));
+                        userMapper.updateAbleUserMoney(cmMallUser);
+                        userMapper.updateUserMoney(cmMallUser);
+                        cmMallOrder.setStatus(31);//已收款待发货
+                        cmMallOrder.setReceiptStatus("3");
+                        cmMallOrder.setPayFlag("1");
                         isPaySuccessFlag = true;
                     }
-                    cmOrder.setPayTime(dateStr);//支付时间
+                    cmMallOrder.setPayTime(dateStr);//支付时间
 
                 }
             } else {
@@ -474,73 +473,73 @@ public class OrderServiceImpl implements OrderService {
             double v = payableAmount.subtract(new BigDecimal(orderShouldPayFee)).doubleValue();
             logger.info(">>>>>payableAmount:" + payableAmount + "orderShouldPayFee:" + orderShouldPayFee);
             if (v < -0.1d || v > 0.1d) {//考虑前端计算不精确
-                return wxJsonModel.error("-1", "订单付款金额异常");
+                return cmWxJsonModel.error("-1", "订单付款金额异常");
             }
 
             /**判断发票使用*/
-            UserInvoiceInfo info = personalMapper.findInvoice(userId);
+            CmMallUserInvoiceInfo info = personalMapper.findInvoice(userId);
             if (null != info) {
-                cmOrder.setInvoiceFlag("2");//是否开发票 没开发票0 /开个人发票1 /开企业发票2【小程序目前只存在0,2】
+                cmMallOrder.setInvoiceFlag("2");//是否开发票 没开发票0 /开个人发票1 /开企业发票2【小程序目前只存在0,2】
             } else {
-                cmOrder.setInvoiceFlag("0");
+                cmMallOrder.setInvoiceFlag("0");
             }
 
             /**初始化主订单参数*/
             String orderNo = NoUtils.getCmOrderNo("X");
-            cmOrder.setOrderNo(orderNo);
-            cmOrder.setOrganizeID(organizeID);
-            cmOrder.setUserID(userId);
-            cmOrder.setBuyUserID(cmOperationID);//操作者的ID(下单人)
-            cmOrder.setOrderSubmitType(2);// 2:员工帮会所下单
-            cmOrder.setOrderType(1);//订单类型 协销订单0 、普通订单(自主订单)1
-            cmOrder.setHasActProduct("0");
-            cmOrder.setSendOutStatus("1");//待发货
-            cmOrder.setProductTotalFee(productTotalFee);
-            cmOrder.setOrderTotalFee(productTotalFee);
-            cmOrder.setPayTotalFee(payTotalFee);
-            cmOrder.setPayableAmount(payableAmount.doubleValue());
-            cmOrder.setPreferential(0d);
-            cmOrder.setDiscountFee(0d);//经理折扣
-            cmOrder.setSpID(null);
-            cmOrder.setMainSpID(null);
-            cmOrder.setClubID(clubID);
-            cmOrder.setOrderSource("6");//小程序
-            cmOrder.setConfirmTime(dateStr);
-            cmOrder.setOrderTime(dateStr);
-            cmOrder.setProductCount(productCount);
-            cmOrder.setPresentCount(0);
-            cmOrder.setConfirmFlag("1");
-            cmOrder.setClauseID(1);
-            cmOrder.setClauseContent(null);
-            cmOrder.setClauseName(null);
-            cmOrder.setUpdateDate(dateStr);
-            cmOrder.setDelFlag("0");
-            cmOrder.setSplitFlag("0");//0不可拆分
-            cmOrder.setPostageOrderFlag("0");//0不是邮费订单
-            cmOrder.setBalancePayFee(balancePayFee);//余额支付金额
-            cmOrder.setPayStatus("1");//(付款供应商)付款状态：1待付款、2部分付款、3已付款
-            cmOrder.setOnlinePayFlag("0");//是否能走线上支付 0可以 1不可以 只能线下
+            cmMallOrder.setOrderNo(orderNo);
+            cmMallOrder.setOrganizeID(organizeID);
+            cmMallOrder.setUserID(userId);
+            cmMallOrder.setBuyUserID(cmOperationID);//操作者的ID(下单人)
+            cmMallOrder.setOrderSubmitType(2);// 2:员工帮会所下单
+            cmMallOrder.setOrderType(1);//订单类型 协销订单0 、普通订单(自主订单)1
+            cmMallOrder.setHasActProduct("0");
+            cmMallOrder.setSendOutStatus("1");//待发货
+            cmMallOrder.setProductTotalFee(productTotalFee);
+            cmMallOrder.setOrderTotalFee(productTotalFee);
+            cmMallOrder.setPayTotalFee(payTotalFee);
+            cmMallOrder.setPayableAmount(payableAmount.doubleValue());
+            cmMallOrder.setPreferential(0d);
+            cmMallOrder.setDiscountFee(0d);//经理折扣
+            cmMallOrder.setSpID(null);
+            cmMallOrder.setMainSpID(null);
+            cmMallOrder.setClubID(clubID);
+            cmMallOrder.setOrderSource("6");//小程序
+            cmMallOrder.setConfirmTime(dateStr);
+            cmMallOrder.setOrderTime(dateStr);
+            cmMallOrder.setProductCount(productCount);
+            cmMallOrder.setPresentCount(0);
+            cmMallOrder.setConfirmFlag("1");
+            cmMallOrder.setClauseID(1);
+            cmMallOrder.setClauseContent(null);
+            cmMallOrder.setClauseName(null);
+            cmMallOrder.setUpdateDate(dateStr);
+            cmMallOrder.setDelFlag("0");
+            cmMallOrder.setSplitFlag("0");//0不可拆分
+            cmMallOrder.setPostageOrderFlag("0");//0不是邮费订单
+            cmMallOrder.setBalancePayFee(balancePayFee);//余额支付金额
+            cmMallOrder.setPayStatus("1");//(付款供应商)付款状态：1待付款、2部分付款、3已付款
+            cmMallOrder.setOnlinePayFlag("0");//是否能走线上支付 0可以 1不可以 只能线下
 
             //保存住订单数据
-            orderMapper.insert(cmOrder);
-            Integer orderID = cmOrder.getOrderID();
+            orderMapper.insert(cmMallOrder);
+            Integer orderID = cmMallOrder.getOrderID();
             logger.info(">>>>>orderID：" + orderID);
 
             if (useBalanceFlag) {
                 /**添加余额收支记录*/
-                CmUserBalanceRecord cmUserBalanceRecord = new CmUserBalanceRecord();
-                cmUserBalanceRecord.setUserId(userId);
-                cmUserBalanceRecord.setType("2");
-                cmUserBalanceRecord.setBalanceType("1");
-                cmUserBalanceRecord.setAddDate(new Date());
-                cmUserBalanceRecord.setAmount(String.valueOf(balancePayFee));
-                cmUserBalanceRecord.setOrderId(cmOrder.getOrderID());
-                cmUserBalanceRecord.setDelFlag("0");
-                userMapper.insertUserBalanceRecord(cmUserBalanceRecord);
+                CmMallUserBalanceRecord cmMallUserBalanceRecord = new CmMallUserBalanceRecord();
+                cmMallUserBalanceRecord.setUserId(userId);
+                cmMallUserBalanceRecord.setType("2");
+                cmMallUserBalanceRecord.setBalanceType("1");
+                cmMallUserBalanceRecord.setAddDate(new Date());
+                cmMallUserBalanceRecord.setAmount(String.valueOf(balancePayFee));
+                cmMallUserBalanceRecord.setOrderId(cmMallOrder.getOrderID());
+                cmMallUserBalanceRecord.setDelFlag("0");
+                userMapper.insertUserBalanceRecord(cmMallUserBalanceRecord);
             }
 
             /**保存订单商品*/
-            for (CmOrderProduct product : orderProductList) {//循环插入数据
+            for (CmMallOrderProduct product : orderProductList) {//循环插入数据
                 product.setOrderID(orderID);
                 product.setOrderNo(orderNo);
                 //保存订单商品数据
@@ -556,11 +555,11 @@ public class OrderServiceImpl implements OrderService {
                 String note = shopOrder.getValue();
 
                 /**统计子订单金额信息*/
-                CmOrderProduct cmOrderProduct = new CmOrderProduct();
-                cmOrderProduct.setOrderID(cmOrder.getOrderID());
-                cmOrderProduct.setShopID(shopID);
+                CmMallOrderProduct cmMallOrderProduct = new CmMallOrderProduct();
+                cmMallOrderProduct.setOrderID(cmMallOrder.getOrderID());
+                cmMallOrderProduct.setShopID(shopID);
                 //查询属于该供应商的所有订单商品信息
-                List<CmOrderProduct> cmOrderProductList = orderProductMapper.findList(cmOrderProduct);
+                List<CmMallOrderProduct> cmMallOrderProductList = orderProductMapper.findList(cmMallOrderProduct);
                 BigDecimal totalAmount = new BigDecimal(0); // 订单总金额
                 BigDecimal productAmount = new BigDecimal(0); //商品总金额
                 BigDecimal needPayAmount = new BigDecimal(0);//需要支付金额
@@ -569,7 +568,7 @@ public class OrderServiceImpl implements OrderService {
                 Double shopProductAmount = 0D;//商品费
                 Integer buyNum = 0;//总购买数
                 //计算子订单信息
-                for (CmOrderProduct orderProduct : cmOrderProductList) {
+                for (CmMallOrderProduct orderProduct : cmMallOrderProductList) {
                     productAmount = MathUtil.add(productAmount, orderProduct.getTotalAmount());//商品总金额 包括赠品
                     totalAmount = MathUtil.add(totalAmount, orderProduct.getTotalFee());//订单总金额 包括税费
                     needPayAmount = MathUtil.add(needPayAmount, orderProduct.getShouldPayFee()); //应付金额
@@ -580,113 +579,113 @@ public class OrderServiceImpl implements OrderService {
                 }
 
                 //初始化子订单信息
-                CmShopOrder cmShopOrder = new CmShopOrder();
-                cmShopOrder.setOrganizeID(organizeID);
-                cmShopOrder.setClubID(clubID);
-                cmShopOrder.setSpID(null);
-                cmShopOrder.setMainSpID(null);
-                cmShopOrder.setOrderID(orderID);
-                cmShopOrder.setOrderNo(orderNo);
-                cmShopOrder.setUserID(userId);
-                cmShopOrder.setNote(note);
-                cmShopOrder.setOrderTime(dateStr);
-                cmShopOrder.setDiscountFee(0d);
-                cmShopOrder.setCanRefundFlag(1);
-                cmShopOrder.setCanRefundAmount(needPayAmount.doubleValue());
-                cmShopOrder.setAccountAmount(0d);
-                cmShopOrder.setBrokerage(brokerage.doubleValue());//佣金 采美应收
-                cmShopOrder.setBuyStatus("1");
-                cmShopOrder.setPresentNum(0);
-                cmShopOrder.setUseBeanFlag(0);
-                cmShopOrder.setUseBeanAmount(0);
-                cmShopOrder.setUseBalanceFlag(0);
-                cmShopOrder.setRefundStatus(0);
-                cmShopOrder.setRefundsAmount(0d);
-                cmShopOrder.setPayStatus("1");
-                cmShopOrder.setSendOutStatus("1");
-                cmShopOrder.setPayFlag("0");
-                cmShopOrder.setOrderStatusFlag("1");
-                cmShopOrder.setDelFlag("0");
-                cmShopOrder.setItemCount(buyNum);//购买商品数
-                cmShopOrder.setPresentNum(0);//赠送数
-                cmShopOrder.setShopID(shopID);
-                cmShopOrder.setOrderType(1);
-                cmShopOrder.setOrderSubmitType(cmOrder.getOrderSubmitType());
-                cmShopOrder.setTotalAmount(totalAmount.doubleValue());
-                cmShopOrder.setProductAmount(productAmount.doubleValue());
-                cmShopOrder.setNeedPayAmount(needPayAmount.doubleValue());
-                cmShopOrder.setPreferential(preferential.doubleValue());
-                cmShopOrder.setShopProductAmount(shopProductAmount);
-                cmShopOrder.setShopPostFee(0D);//付给供应商运费
-                cmShopOrder.setShopTaxFee(0D);//付给供应商税费
-                cmShopOrder.setPayedShopAmount(0D);//已付款金额
-                cmShopOrder.setShopOtherFee(0D);//付第三方
-                cmShopOrder.setSplitFlag("0");
-
-                List<CmShopOrder> cmShopOrders1 = cmShopOrderMapper.findMaxShopOrderNo(cmOrder.getOrderID());
+                CmMallShopOrder cmMallShopOrder = new CmMallShopOrder();
+                cmMallShopOrder.setOrganizeID(organizeID);
+                cmMallShopOrder.setClubID(clubID);
+                cmMallShopOrder.setSpID(null);
+                cmMallShopOrder.setMainSpID(null);
+                cmMallShopOrder.setOrderID(orderID);
+                cmMallShopOrder.setOrderNo(orderNo);
+                cmMallShopOrder.setUserID(userId);
+                cmMallShopOrder.setNote(note);
+                cmMallShopOrder.setOrderTime(dateStr);
+                cmMallShopOrder.setDiscountFee(0d);
+                cmMallShopOrder.setCanRefundFlag(1);
+                cmMallShopOrder.setCanRefundAmount(needPayAmount.doubleValue());
+                cmMallShopOrder.setAccountAmount(0d);
+                cmMallShopOrder.setBrokerage(brokerage.doubleValue());//佣金 采美应收
+                cmMallShopOrder.setBuyStatus("1");
+                cmMallShopOrder.setPresentNum(0);
+                cmMallShopOrder.setUseBeanFlag(0);
+                cmMallShopOrder.setUseBeanAmount(0);
+                cmMallShopOrder.setUseBalanceFlag(0);
+                cmMallShopOrder.setRefundStatus(0);
+                cmMallShopOrder.setRefundsAmount(0d);
+                cmMallShopOrder.setPayStatus("1");
+                cmMallShopOrder.setSendOutStatus("1");
+                cmMallShopOrder.setPayFlag("0");
+                cmMallShopOrder.setOrderStatusFlag("1");
+                cmMallShopOrder.setDelFlag("0");
+                cmMallShopOrder.setItemCount(buyNum);//购买商品数
+                cmMallShopOrder.setPresentNum(0);//赠送数
+                cmMallShopOrder.setShopID(shopID);
+                cmMallShopOrder.setOrderType(1);
+                cmMallShopOrder.setOrderSubmitType(cmMallOrder.getOrderSubmitType());
+                cmMallShopOrder.setTotalAmount(totalAmount.doubleValue());
+                cmMallShopOrder.setProductAmount(productAmount.doubleValue());
+                cmMallShopOrder.setNeedPayAmount(needPayAmount.doubleValue());
+                cmMallShopOrder.setPreferential(preferential.doubleValue());
+                cmMallShopOrder.setShopProductAmount(shopProductAmount);
+                cmMallShopOrder.setShopPostFee(0D);//付给供应商运费
+                cmMallShopOrder.setShopTaxFee(0D);//付给供应商税费
+                cmMallShopOrder.setPayedShopAmount(0D);//已付款金额
+                cmMallShopOrder.setShopOtherFee(0D);//付第三方
+                cmMallShopOrder.setSplitFlag("0");
+
+                List<CmMallShopOrder> cmMallShopOrders1 = cmShopOrderMapper.findMaxShopOrderNo(cmMallOrder.getOrderID());
                 String shopOrderNo = ""; //子订单编号
-                if (!CollectionUtils.isEmpty(cmShopOrders1)) {
-                    shopOrderNo = cmShopOrders1.get(0).getShopOrderNo();
-                    cmShopOrder.setShopOrderNo(NoUtils.getCmShopOrderNo(cmOrder.getOrderNo(), Integer.parseInt(shopOrderNo.substring(shopOrderNo.length() - 2, shopOrderNo.length())) + 1));
+                if (!CollectionUtils.isEmpty(cmMallShopOrders1)) {
+                    shopOrderNo = cmMallShopOrders1.get(0).getShopOrderNo();
+                    cmMallShopOrder.setShopOrderNo(NoUtils.getCmShopOrderNo(cmMallOrder.getOrderNo(), Integer.parseInt(shopOrderNo.substring(shopOrderNo.length() - 2, shopOrderNo.length())) + 1));
                 } else {
-                    cmShopOrder.setShopOrderNo(NoUtils.getCmShopOrderNo(cmOrder.getOrderNo(), 1));
+                    cmMallShopOrder.setShopOrderNo(NoUtils.getCmShopOrderNo(cmMallOrder.getOrderNo(), 1));
                 }
                 //保存子订单信息到数据库
-                cmShopOrderMapper.insert(cmShopOrder);
-                shopOrderIDs += ((shopOrderIDs.equals("") ? "" : ",") + cmShopOrder.getShopOrderID());
-                for (CmOrderProduct orderProduct : cmOrderProductList) {
-                    orderProduct.setShopOrderID(cmShopOrder.getShopOrderID());
-                    orderProduct.setShopOrderNo(cmShopOrder.getShopOrderNo());
+                cmShopOrderMapper.insert(cmMallShopOrder);
+                shopOrderIDs += ((shopOrderIDs.equals("") ? "" : ",") + cmMallShopOrder.getShopOrderID());
+                for (CmMallOrderProduct orderProduct : cmMallOrderProductList) {
+                    orderProduct.setShopOrderID(cmMallShopOrder.getShopOrderID());
+                    orderProduct.setShopOrderNo(cmMallShopOrder.getShopOrderNo());
                     orderProductMapper.update(orderProduct);
                 }
             }
 
             //更新主订单信息
-            cmOrder.setShopOrderIDs(shopOrderIDs);//子订单ID:1000,1002
-            orderMapper.update(cmOrder);
+            cmMallOrder.setShopOrderIDs(shopOrderIDs);//子订单ID:1000,1002
+            orderMapper.update(cmMallOrder);
 
             //获取地址信息
-            Address address = addressMapper.findByAddressID(addressID);
-            if (null != address) {
+            CmMallAddress cmMallAddress = addressMapper.findByAddressID(addressID);
+            if (null != cmMallAddress) {
                 //保存地址信息
-                BpOrderUserInfo bpOrderUserInfo = new BpOrderUserInfo();
-                bpOrderUserInfo.setOrderId(orderID);
-                bpOrderUserInfo.setClubId(clubID);
-                bpOrderUserInfo.setUserId(userId);
-                bpOrderUserInfo.setName(user.getUserName());
-                bpOrderUserInfo.setShouHuoRen(address.getShouHuoRen());
-                bpOrderUserInfo.setMobile(address.getMobile());
-                bpOrderUserInfo.setPostalCode(address.getPhone());
-                bpOrderUserInfo.setPostalCode(address.getPostalCode());
-                bpOrderUserInfo.setTownId(address.getTownID());
-                bpOrderUserInfo.setProvince(address.getProvince());
-                bpOrderUserInfo.setCity(address.getCity());
-                bpOrderUserInfo.setTown(address.getTown());
-                bpOrderUserInfo.setAddress(address.getAddressDetail());
-                bpUserInfoMapper.insertUserInfo(bpOrderUserInfo);
+                CmMallBpOrderUserInfo cmMallBpOrderUserInfo = new CmMallBpOrderUserInfo();
+                cmMallBpOrderUserInfo.setOrderId(orderID);
+                cmMallBpOrderUserInfo.setClubId(clubID);
+                cmMallBpOrderUserInfo.setUserId(userId);
+                cmMallBpOrderUserInfo.setName(cmMallUser.getUserName());
+                cmMallBpOrderUserInfo.setShouHuoRen(cmMallAddress.getShouHuoRen());
+                cmMallBpOrderUserInfo.setMobile(cmMallAddress.getMobile());
+                cmMallBpOrderUserInfo.setPostalCode(cmMallAddress.getPhone());
+                cmMallBpOrderUserInfo.setPostalCode(cmMallAddress.getPostalCode());
+                cmMallBpOrderUserInfo.setTownId(cmMallAddress.getTownID());
+                cmMallBpOrderUserInfo.setProvince(cmMallAddress.getProvince());
+                cmMallBpOrderUserInfo.setCity(cmMallAddress.getCity());
+                cmMallBpOrderUserInfo.setTown(cmMallAddress.getTown());
+                cmMallBpOrderUserInfo.setAddress(cmMallAddress.getAddressDetail());
+                bpUserInfoMapper.insertUserInfo(cmMallBpOrderUserInfo);
             } else {
-                return wxJsonModel.error("订单地址异常");
+                return cmWxJsonModel.error("订单地址异常");
             }
 
 
             //保存发票信息(发票采用不可选，只要用户存在增值税发票则保存最新记录即可)
-            UserInvoiceInfo invoiceInfo = personalMapper.findInvoice(userId);
+            CmMallUserInvoiceInfo invoiceInfo = personalMapper.findInvoice(userId);
             if (null != invoiceInfo) {
-                OrderInvoice orderInvoice = new OrderInvoice();
-                orderInvoice.setOrderId(orderID);
-                orderInvoice.setInvoiceTitle(invoiceInfo.getInvoiceTitle());
-                orderInvoice.setType("2");//增值税发票
-                orderInvoice.setCorporationTaxNum(invoiceInfo.getCorporationTaxNum());
-                orderInvoice.setRegisteredAddress(invoiceInfo.getRegisteredAddress());
-                orderInvoice.setRegisteredPhone(invoiceInfo.getRegisteredPhone());
-                orderInvoice.setBankAccountNo(invoiceInfo.getBankAccountNo());
-                orderInvoice.setOpenBank(invoiceInfo.getOpenBank());
-                orderMapper.insertOrderInvoice(orderInvoice);
+                CmMallOrderInvoice cmMallOrderInvoice = new CmMallOrderInvoice();
+                cmMallOrderInvoice.setOrderId(orderID);
+                cmMallOrderInvoice.setInvoiceTitle(invoiceInfo.getInvoiceTitle());
+                cmMallOrderInvoice.setType("2");//增值税发票
+                cmMallOrderInvoice.setCorporationTaxNum(invoiceInfo.getCorporationTaxNum());
+                cmMallOrderInvoice.setRegisteredAddress(invoiceInfo.getRegisteredAddress());
+                cmMallOrderInvoice.setRegisteredPhone(invoiceInfo.getRegisteredPhone());
+                cmMallOrderInvoice.setBankAccountNo(invoiceInfo.getBankAccountNo());
+                cmMallOrderInvoice.setOpenBank(invoiceInfo.getOpenBank());
+                orderMapper.insertOrderInvoice(cmMallOrderInvoice);
             }
 
             //提交订单完成后清理购物车(用户ID,商品ID)
             if (StringUtils.equals("1", cartType)) {//购物车提交后清理购物车
-                for (CmOrderProduct product : orderProductList) {//循环插入数据
+                for (CmMallOrderProduct product : orderProductList) {//循环插入数据
                     shoppingMapper.deleteCart(userId, product.getOrganizeProductID());
                 }
             }
@@ -694,53 +693,53 @@ public class OrderServiceImpl implements OrderService {
 
         /**构造返回参数*/
         Map<String, String> info = new HashMap<>();
-        info.put("orderID", String.valueOf(cmOrder.getOrderID()));
-        info.put("orderNo", String.valueOf(cmOrder.getOrderNo()));
-        info.put("orderMark", "#" + String.valueOf(cmOrder.getOrderID()) + "#");
-        info.put("payTotalFee", String.valueOf(cmOrder.getPayTotalFee()));//应付订单金额
-        info.put("payableAmount", String.valueOf(cmOrder.getPayableAmount()));//真实需要付款金额
+        info.put("orderID", String.valueOf(cmMallOrder.getOrderID()));
+        info.put("orderNo", String.valueOf(cmMallOrder.getOrderNo()));
+        info.put("orderMark", "#" + String.valueOf(cmMallOrder.getOrderID()) + "#");
+        info.put("payTotalFee", String.valueOf(cmMallOrder.getPayTotalFee()));//应付订单金额
+        info.put("payableAmount", String.valueOf(cmMallOrder.getPayableAmount()));//真实需要付款金额
         if (isPaySuccessFlag) {//余额抵扣成功
-            return wxJsonModel.success("1", info, "提交成功且已支付");//1提交成功[且支付完成]
+            return cmWxJsonModel.success("1", info, "提交成功且已支付");//1提交成功[且支付完成]
         } else {
-            return wxJsonModel.success("2", info, "提交成功但未支付");
+            return cmWxJsonModel.success("2", info, "提交成功但未支付");
         }
     }
 
 
     @Override
-    public List<CmLogisticsBatch> logistics(Integer orderID) throws Exception {
+    public List<CmMallLogisticsBatch> logistics(Integer orderID) throws Exception {
         //物流商品信息
-        CmOrder order = orderMapper.findOrder(orderID);
+        CmMallOrder order = orderMapper.findOrder(orderID);
         if (order == null) throw new Exception("订单已删除");
-        List<CmLogisticsBatch> batchList = orderMapper.findLogistics(orderID);
-        for (CmLogisticsBatch batch : batchList) {
+        List<CmMallLogisticsBatch> batchList = orderMapper.findLogistics(orderID);
+        for (CmMallLogisticsBatch batch : batchList) {
             List<String> shopOrderIDList = orderMapper.findShopOrderID(orderID, batch.getId());
             String[] ShopOrderIDs = shopOrderIDList.toArray(new String[shopOrderIDList.size()]);
-            List<CmShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
-            for (CmShopOrder shopOrder : shopOrderList) {
-                List<CmLogisticsRecord> logisticsRecordList = orderMapper.findLogisticsRecord(shopOrder.getShopOrderID(), batch.getId());
-                for (CmLogisticsRecord logisticsRecord : logisticsRecordList) {
+            List<CmMallShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
+            for (CmMallShopOrder shopOrder : shopOrderList) {
+                List<CmMallLogisticsRecord> logisticsRecordList = orderMapper.findLogisticsRecord(shopOrder.getShopOrderID(), batch.getId());
+                for (CmMallLogisticsRecord logisticsRecord : logisticsRecordList) {
                     logisticsRecord.setImage(AppUtils.getImageURL("product", logisticsRecord.getImage(), 0, domain));
                 }
-                shopOrder.setCmLogisticsRecords(logisticsRecordList);
+                shopOrder.setCmMallLogisticsRecords(logisticsRecordList);
                 shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
             }
             //物流信息
-            List<LogisticsInfo> logisticsInfoList = orderMapper.findLogisticsInfo(batch.getId());
-            for (LogisticsInfo logisticsInfo : logisticsInfoList) {
-                List<Router> routers = JSONArray.parseArray(logisticsInfo.getInfo(), Router.class);
-                logisticsInfo.setRouters(routers);
+            List<CmMallLogisticsInfo> cmMallLogisticsInfoList = orderMapper.findLogisticsInfo(batch.getId());
+            for (CmMallLogisticsInfo cmMallLogisticsInfo : cmMallLogisticsInfoList) {
+                List<CmMallRouter> cmMallRouters = JSONArray.parseArray(cmMallLogisticsInfo.getInfo(), CmMallRouter.class);
+                cmMallLogisticsInfo.setCmMallRouters(cmMallRouters);
             }
-            batch.setLogisticsInfos(logisticsInfoList);
+            batch.setCmMallLogisticsInfos(cmMallLogisticsInfoList);
             batch.setShopOrderList(shopOrderList);
         }
         return batchList;
     }
 
     @Override
-    public List<CmOrder> myOrder(Integer userID, Integer orderState, Integer organizeID) {
-        List<CmOrder> orderList = orderMapper.findAllOrder(userID, orderState, organizeID);
-        for (CmOrder order : orderList) {
+    public List<CmMallOrder> myOrder(Integer userID, Integer orderState, Integer organizeID) {
+        List<CmMallOrder> orderList = orderMapper.findAllOrder(userID, orderState, organizeID);
+        for (CmMallOrder order : orderList) {
             //111,待付待收待发
             if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
                 order.setStatus(111);
@@ -751,13 +750,13 @@ public class OrderServiceImpl implements OrderService {
             } else {
                 ShopOrderIDs = new String[]{order.getShopOrderIDs()};
             }
-            List<CmShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
-            for (CmShopOrder shopOrder : shopOrderList) {
-                List<CmOrderProduct> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderID());
-                for (CmOrderProduct orderProduct : orderProductList) {
+            List<CmMallShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
+            for (CmMallShopOrder shopOrder : shopOrderList) {
+                List<CmMallOrderProduct> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderID());
+                for (CmMallOrderProduct orderProduct : orderProductList) {
                     orderProduct.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
                 }
-                shopOrder.setCmOrderProducts(orderProductList);
+                shopOrder.setCmMallOrderProducts(orderProductList);
                 shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
             }
             order.setShopOrderList(shopOrderList);
@@ -772,23 +771,23 @@ public class OrderServiceImpl implements OrderService {
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
         //商品分页数据
-        List<CmOrganizeProducts> organizeProductsList = orderMapper.oftenPurchase(userID, organizeID);
-        for (CmOrganizeProducts organizeProducts : organizeProductsList) {
+        List<CmMallOrganizeProducts> organizeProductsList = orderMapper.oftenPurchase(userID, organizeID);
+        for (CmMallOrganizeProducts organizeProducts : organizeProductsList) {
             organizeProducts.setMainImage(AppUtils.getImageURL("product", organizeProducts.getMainImage(), 0, domain));
         }
-        Page<CmOrganizeProducts> page = new Page<>(organizeProductsList);
+        CmMallPage<CmMallOrganizeProducts> cmMallPage = new CmMallPage<>(organizeProductsList);
         //购物车数量
         Integer count = homePageMapper.cartQuantity(userID);
         if (count == null) count = 0;
-        map.put("page", page);
+        map.put("cmMallPage", cmMallPage);
         map.put("count", count);
         return map;
     }
 
     @Override
-    public WxJsonModel deleteOrder(Integer orderID) {
-        WxJsonModel model = WxJsonModel.newInstance();
-        CmOrder order = orderMapper.findOrder(orderID);
+    public CmWxJsonModel deleteOrder(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        CmMallOrder order = orderMapper.findOrder(orderID);
         if (order == null) return model.error("订单不存在");
         if (!(order.getStatus() == 6)) {
             return model.error("订单异常");
@@ -805,25 +804,25 @@ public class OrderServiceImpl implements OrderService {
             ShopOrderIDs = new String[]{order.getShopOrderIDs()};
         }
         for (String shopOrderID : ShopOrderIDs) {
-            CmShopOrder shopOrder = cmShopOrderMapper.get(Integer.valueOf(shopOrderID));
+            CmMallShopOrder shopOrder = cmShopOrderMapper.get(Integer.valueOf(shopOrderID));
             shopOrder.setDelFlag("1");
             cmShopOrderMapper.update(shopOrder);
         }
 
         //逻辑删除收款记录
-        List<CmDiscernReceipt> discernReceipt = orderMapper.findDiscernReceipt(orderID);
+        List<CmMallDiscernReceipt> discernReceipt = orderMapper.findDiscernReceipt(orderID);
         if (discernReceipt != null && discernReceipt.size() > 0) {
             orderMapper.deleteReceiptOrderRelation(orderID);
-            for (CmDiscernReceipt receipt : discernReceipt) {
+            for (CmMallDiscernReceipt receipt : discernReceipt) {
                 orderMapper.deleteDiscernReceipt(receipt.getId());
             }
         }
         //逻辑删除付款记录
         for (String shopOrderID : ShopOrderIDs) {
-            List<CmPayShopRecord> payShopRecordList = orderMapper.findPayShopRecord(Integer.valueOf(shopOrderID));
+            List<CmMallPayShopRecord> payShopRecordList = orderMapper.findPayShopRecord(Integer.valueOf(shopOrderID));
             if (payShopRecordList != null && payShopRecordList.size() > 0) {
                 orderMapper.deletePayShopRecord(Integer.valueOf(shopOrderID));
-                for (CmPayShopRecord payShopRecord : payShopRecordList) {
+                for (CmMallPayShopRecord payShopRecord : payShopRecordList) {
                     orderMapper.updatePayShop(payShopRecord.getPayShopID());
                 }
             }
@@ -833,7 +832,7 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     public void cancelOrder(Integer orderID) throws Exception {
-        CmOrder order = orderMapper.findOrder(orderID);
+        CmMallOrder order = orderMapper.findOrder(orderID);
         if (order == null) throw new Exception("订单不存在");
         if (!(order.getStatus() == 11)) {
             throw new Exception("订单异常");
@@ -844,7 +843,7 @@ public class OrderServiceImpl implements OrderService {
 
     @Override
     public void affirmCargo(Integer orderID) throws Exception {
-        CmOrder order = orderMapper.findOrder(orderID);
+        CmMallOrder order = orderMapper.findOrder(orderID);
         if (order == null) throw new Exception("订单不存在");
         if (order.getStatus() == 33 && order.getPayStatus().equals("3")) {
             //已付款供应商,订单完成

src/main/java/com/caimei/service/products/DetailsService.java

@@ -1,10 +1,10 @@
 package com.caimei.service.products;
 
 import com.caimei.entity.CmMallCart;
-import com.caimei.entity.CmOrganizeProducts;
+import com.caimei.entity.CmMallOrganizeProducts;
 
 public interface DetailsService {
-    CmOrganizeProducts productDetails(Integer id, Integer userID);
+    CmMallOrganizeProducts productDetails(Integer id, Integer userID);
 
     Integer saveCart(CmMallCart cmMallCart);
 }

src/main/java/com/caimei/service/products/HomePageService.java

@@ -1,8 +1,8 @@
 package com.caimei.service.products;
 
+import com.caimei.entity.CmMallHospital;
 import com.caimei.entity.CmMallOrganize;
-import com.caimei.entity.CmOrganizeProducts;
-import com.caimei.entity.hospital;
+import com.caimei.entity.CmMallOrganizeProducts;
 
 import java.util.List;
 import java.util.Map;
@@ -10,11 +10,11 @@ import java.util.Map;
 public interface HomePageService {
     Map<String, Object> information(Integer organizeID, Integer userID);
 
-    List<CmOrganizeProducts> classify(CmOrganizeProducts organizeProducts);
+    List<CmMallOrganizeProducts> classify(CmMallOrganizeProducts organizeProducts);
 
-    List<CmOrganizeProducts> preferred(CmOrganizeProducts organizeProducts);
+    List<CmMallOrganizeProducts> preferred(CmMallOrganizeProducts organizeProducts);
 
-    List<hospital> member();
+    List<CmMallHospital> member();
 
     CmMallOrganize afterSale(Integer organizeID);
 }

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

@@ -23,15 +23,15 @@ public class DetailsServiceImpl implements DetailsService {
     private String domain;
 
     @Override
-    public CmOrganizeProducts productDetails(Integer id, Integer userID) {
+    public CmMallOrganizeProducts productDetails(Integer id, Integer userID) {
         //商品信息
-        CmOrganizeProducts organizeProducts = detailsMapper.findProduct(id);
-        Product product = detailsMapper.product(organizeProducts.getProductID());
+        CmMallOrganizeProducts organizeProducts = detailsMapper.findProduct(id);
+        CmMallProduct cmMallProduct = detailsMapper.product(organizeProducts.getProductID());
         String[] split = null;
         String tags = "";
         //商品标签
-        if (product.getTags() != null) {
-            tags = product.getTags();
+        if (cmMallProduct.getTags() != null) {
+            tags = cmMallProduct.getTags();
             tags = tags.replace(" ", ",");
             tags = tags.replace("、", ",");
             tags = tags.replace("，", ",");
@@ -44,29 +44,29 @@ public class DetailsServiceImpl implements DetailsService {
                 }
             }
         }
-        product.setTagsList(split);
-        product.setMainImage(AppUtils.getImageURL("product", product.getMainImage(), 0, domain));
-        if (product.getStock() == null || product.getStock() == 0) product.setStock(99);
-        organizeProducts.setProduct(product);
+        cmMallProduct.setTagsList(split);
+        cmMallProduct.setMainImage(AppUtils.getImageURL("cmMallProduct", cmMallProduct.getMainImage(), 0, domain));
+        if (cmMallProduct.getStock() == null || cmMallProduct.getStock() == 0) cmMallProduct.setStock(99);
+        organizeProducts.setCmMallProduct(cmMallProduct);
         //商品图片
-        List<ProductImage> productImage = detailsMapper.findAllProductImage(organizeProducts.getProductID());
-        for (ProductImage image : productImage) {
-            String imageURL = AppUtils.getImageURL("product", image.getImage(), 0, domain);
+        List<CmMallProductImage> cmMallProductImage = detailsMapper.findAllProductImage(organizeProducts.getProductID());
+        for (CmMallProductImage image : cmMallProductImage) {
+            String imageURL = AppUtils.getImageURL("cmMallProduct", image.getImage(), 0, domain);
             image.setImage(imageURL);
         }
-        organizeProducts.setProductImage(productImage);
+        organizeProducts.setCmMallProductImage(cmMallProductImage);
         //商品详情
-        ProductDetailInfo productDetailInfo = detailsMapper.findProductDetail(organizeProducts.getProductID());
-        organizeProducts.setProductDetailInfo(productDetailInfo);
+        CmMallProductDetailInfo cmMallProductDetailInfo = detailsMapper.findProductDetail(organizeProducts.getProductID());
+        organizeProducts.setCmMallProductDetailInfo(cmMallProductDetailInfo);
         //供应商信息
-        Shop shop = detailsMapper.findShop(product.getShopID());
-        if (shop.getBusinessScope() != null && shop.getBusinessScope().contains("/")) {
-            String[] businessScopeArray = shop.getBusinessScope().split("/");
-            shop.setBusinessScopeArray(businessScopeArray);
+        CmMallShop cmMallShop = detailsMapper.findShop(cmMallProduct.getShopID());
+        if (cmMallShop.getBusinessScope() != null && cmMallShop.getBusinessScope().contains("/")) {
+            String[] businessScopeArray = cmMallShop.getBusinessScope().split("/");
+            cmMallShop.setBusinessScopeArray(businessScopeArray);
         }
-        shop.setLogo(AppUtils.getImageURL("shopLogo", shop.getLogo(), 0, domain));
-        shop.setBusinessLicenseImage(AppUtils.getImageURL("shopLogo", shop.getBusinessLicenseImage(), 0, domain));
-        organizeProducts.setShop(shop);
+        cmMallShop.setLogo(AppUtils.getImageURL("shopLogo", cmMallShop.getLogo(), 0, domain));
+        cmMallShop.setBusinessLicenseImage(AppUtils.getImageURL("shopLogo", cmMallShop.getBusinessLicenseImage(), 0, domain));
+        organizeProducts.setCmMallShop(cmMallShop);
         //购物车数量
         Integer count = homePageMapper.cartQuantity(userID);
         if (count == null) count = 0;

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

@@ -27,10 +27,10 @@ public class HomePageServiceImpl implements HomePageService {
         logger.info("------------HomePageServiceImpl.information.organizeID:" + organizeID + ",userID:" + userID);
         Map<String, Object> map = new HashMap();
         //商品分类
-        List<CmProductsClassify> productsClassify = homePageMapper.findClassify(organizeID);
+        List<CmMallProductsClassify> productsClassify = homePageMapper.findClassify(organizeID);
         //常用商品
-        List<CmOrganizeProducts> organizeProducts = homePageMapper.findProducts(organizeID);
-        for (CmOrganizeProducts product : organizeProducts) {
+        List<CmMallOrganizeProducts> organizeProducts = homePageMapper.findProducts(organizeID);
+        for (CmMallOrganizeProducts product : organizeProducts) {
             product.setMainImage(AppUtils.getImageURL("product", product.getMainImage(), 0, domain));
         }
         //购物车数量
@@ -50,29 +50,29 @@ public class HomePageServiceImpl implements HomePageService {
     }
 
     @Override
-    public List<CmOrganizeProducts> classify(CmOrganizeProducts organizeProducts) {
-        List<CmOrganizeProducts> classify = homePageMapper.classify(organizeProducts);
-        for (CmOrganizeProducts products : classify) {
+    public List<CmMallOrganizeProducts> classify(CmMallOrganizeProducts organizeProducts) {
+        List<CmMallOrganizeProducts> classify = homePageMapper.classify(organizeProducts);
+        for (CmMallOrganizeProducts products : classify) {
             products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
         }
         return classify;
     }
 
     @Override
-    public List<CmOrganizeProducts> preferred(CmOrganizeProducts organizeProducts) {
-        List<CmOrganizeProducts> preferred = homePageMapper.preferred(organizeProducts);
-        for (CmOrganizeProducts products : preferred) {
+    public List<CmMallOrganizeProducts> preferred(CmMallOrganizeProducts organizeProducts) {
+        List<CmMallOrganizeProducts> preferred = homePageMapper.preferred(organizeProducts);
+        for (CmMallOrganizeProducts products : preferred) {
             products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
         }
         return preferred;
     }
 
     @Override
-    public List<hospital> member() {
-        List<hospital> member = homePageMapper.member();
-        for (hospital hospital : member) {
-            List<brand> brands = homePageMapper.findId(hospital.getId());
-            hospital.setBrands(brands);
+    public List<CmMallHospital> member() {
+        List<CmMallHospital> member = homePageMapper.member();
+        for (CmMallHospital CmMallHospital : member) {
+            List<CmMallBrand> CmMallBrands = homePageMapper.findId(CmMallHospital.getId());
+            CmMallHospital.setCmMallBrands(CmMallBrands);
         }
         return member;
     }

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

@@ -1,9 +1,9 @@
 package com.caimei.service.products.impl;
 
 import com.caimei.entity.CmMallCart;
-import com.caimei.entity.CmOrganizeProducts;
-import com.caimei.entity.Page;
-import com.caimei.entity.Shop;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallPage;
+import com.caimei.entity.CmMallShop;
 import com.caimei.mapper.products.HomePageMapper;
 import com.caimei.mapper.products.ShoppingMapper;
 import com.caimei.service.products.ShoppingService;
@@ -33,26 +33,26 @@ public class ShoppingServiceImpl implements ShoppingService {
     public Map<String, Object> findAllCart(Integer userID, Integer index, Integer pageSize) {
         Map<String, Object> map = new HashMap();
         PageHelper.startPage(index, pageSize);
-        List<Shop> shopList = shoppingMapper.findAllShop(userID);
-        if (shopList != null && shopList.size() > 0) {
-            for (Shop shop : shopList) {
-                List<CmOrganizeProducts> productsList = shoppingMapper.findAllProducts(shop.getShopID(), userID);
-                shop.setProductsList(productsList);
+        List<CmMallShop> cmMallShopList = shoppingMapper.findAllShop(userID);
+        if (cmMallShopList != null && cmMallShopList.size() > 0) {
+            for (CmMallShop cmMallShop : cmMallShopList) {
+                List<CmMallOrganizeProducts> productsList = shoppingMapper.findAllProducts(cmMallShop.getShopID(), userID);
+                cmMallShop.setProductsList(productsList);
                 Double totalPrice = 0d;
-                for (CmOrganizeProducts products : productsList) {
+                for (CmMallOrganizeProducts products : productsList) {
                     products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
                     if (products.getValidFlag().equals("1")) {
                         totalPrice += (products.getRetailPrice() * products.getProductCount());
                     }
                 }
-                shop.setTotalPrice(totalPrice);
+                cmMallShop.setTotalPrice(totalPrice);
             }
         }
-        Page<Shop> page = new Page<>(shopList);
+        CmMallPage<CmMallShop> cmMallPage = new CmMallPage<>(cmMallShopList);
         Integer cartQuantity = homePageMapper.cartQuantity(userID);
         if (cartQuantity == null) cartQuantity = 0;
         logger.info("------------ShoppingServiceImpl.findAllCart.cartQuantity:"+cartQuantity);
-        map.put("page", page);
+        map.put("cmMallPage", cmMallPage);
         map.put("cartQuantity", cartQuantity);
         return map;
     }

src/main/java/com/caimei/service/user/LoginService.java

@@ -1,17 +1,17 @@
 package com.caimei.service.user;
 
-import com.caimei.entity.CmOperationUser;
-import com.caimei.entity.WxJsonModel;
+import com.caimei.entity.CmMallOperationUser;
+import com.caimei.entity.CmWxJsonModel;
 
 import javax.servlet.http.HttpServletRequest;
 
 public interface LoginService {
 
-    CmOperationUser doLogin(String openid, Integer userOrganizeID);
+    CmMallOperationUser doLogin(String openid, Integer userOrganizeID);
 
-    CmOperationUser isEnabled(String invitationCode, Integer userOrganizeID);
+    CmMallOperationUser isEnabled(String invitationCode, Integer userOrganizeID);
 
-    WxJsonModel update(CmOperationUser operationUser, HttpServletRequest request);
+    CmWxJsonModel update(CmMallOperationUser operationUser, HttpServletRequest request);
 
     String cellPhone(Integer userOrganizeID);
 }

src/main/java/com/caimei/service/user/PersonalService.java

@@ -6,23 +6,23 @@ import java.util.List;
 import java.util.Map;
 
 public interface PersonalService {
-    Club myCentre(CmOperationUser operationUser);
+    CmMallClub myCentre(CmMallOperationUser operationUser);
 
-    Map<String, Object> touchBalance(Integer index, Integer pageSize, int year, int month, CmUserBalanceRecord balanceRecord);
+    Map<String, Object> touchBalance(Integer index, Integer pageSize, int year, int month, CmMallUserBalanceRecord balanceRecord);
 
-    List<Province> address();
+    List<CmMallProvince> address();
 
-    List<Address> findAddress(Integer userID);
+    List<CmMallAddress> findAddress(Integer userID);
 
-    List<Province> getProvince();
+    List<CmMallProvince> getProvince();
 
-    List<City> getCity(Long provinceid);
+    List<CmMallCity> getCity(Long provinceid);
 
-    List<Town> getTown(Integer cityid);
+    List<CmMallTown> getTown(Integer cityid);
 
-    void saveAddress(Address address);
+    void saveAddress(CmMallAddress cmMallAddress);
 
     void deleteAddress(Integer addressID);
 
-    WxJsonModel invoice(UserInvoiceInfo userInvoiceInfo);
+    CmWxJsonModel invoice(CmMallUserInvoiceInfo cmMallUserInvoiceInfo);
 }

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

@@ -1,7 +1,7 @@
 package com.caimei.service.user.impl;
 
-import com.caimei.entity.CmOperationUser;
-import com.caimei.entity.WxJsonModel;
+import com.caimei.entity.CmMallOperationUser;
+import com.caimei.entity.CmWxJsonModel;
 import com.caimei.mapper.user.LoginMapper;
 import com.caimei.service.user.LoginService;
 import com.caimei.utils.SessionHelper;
@@ -18,26 +18,26 @@ public class LoginServiceImpl implements LoginService {
     private LoginMapper loginMapper;
 
     @Override
-    public CmOperationUser doLogin(String openid, Integer userOrganizeID) {
-        CmOperationUser operationUser = loginMapper.doLogin(openid, userOrganizeID);
+    public CmMallOperationUser doLogin(String openid, Integer userOrganizeID) {
+        CmMallOperationUser operationUser = loginMapper.doLogin(openid, userOrganizeID);
         return operationUser;
     }
 
     @Override
-    public CmOperationUser isEnabled(String invitationCode, Integer userOrganizeID) {
-        CmOperationUser operationUser = loginMapper.isEnabled(invitationCode, userOrganizeID);
+    public CmMallOperationUser isEnabled(String invitationCode, Integer userOrganizeID) {
+        CmMallOperationUser operationUser = loginMapper.isEnabled(invitationCode, userOrganizeID);
         return operationUser;
     }
 
     @Override
-    public WxJsonModel update(CmOperationUser operationUser, HttpServletRequest request) {
-        WxJsonModel res = WxJsonModel.newInstance();
-        CmOperationUser cmOperationUser = loginMapper.doLogin(operationUser.getOpenid(), operationUser.getUserOrganizeID());
+    public CmWxJsonModel update(CmMallOperationUser operationUser, HttpServletRequest request) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
+        CmMallOperationUser cmMallOperationUser = loginMapper.doLogin(operationUser.getOpenid(), operationUser.getUserOrganizeID());
         //判断是否已有绑定用户
-        if (cmOperationUser != null) {
+        if (cmMallOperationUser != null) {
             return res.error("您已授权，无需重复登录");
         }
-        CmOperationUser user = loginMapper.query(operationUser);
+        CmMallOperationUser user = loginMapper.query(operationUser);
         //判断是否存在已下线的会所用户
         if (user != null) {
             user.setOpenid("");
@@ -53,7 +53,7 @@ public class LoginServiceImpl implements LoginService {
         operationUser.setUpdateTime(new Date());
         loginMapper.update(operationUser);
         //传入session,返回用户信息,更新sessionId
-        CmOperationUser user1 = loginMapper.doLogin(operationUser.getOpenid(), operationUser.getUserOrganizeID());
+        CmMallOperationUser user1 = loginMapper.doLogin(operationUser.getOpenid(), operationUser.getUserOrganizeID());
         HttpSession session = SessionHelper.getSession();
         String sessionId = session.getId();
         session.setAttribute("openid", operationUser.getOpenid());

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

@@ -26,39 +26,39 @@ public class PersonalServiceImpl implements PersonalService {
     private HomePageMapper homePageMapper;
 
     @Override
-    public Club myCentre(CmOperationUser operationUser) {
-        Club club = personalMapper.myCentre(operationUser);
-        if (club != null) {
-            Double ableUserMoney = club.getAbleUserMoney();
+    public CmMallClub myCentre(CmMallOperationUser operationUser) {
+        CmMallClub cmMallClub = personalMapper.myCentre(operationUser);
+        if (cmMallClub != null) {
+            Double ableUserMoney = cmMallClub.getAbleUserMoney();
             String userMoney = String.format("%.2f", ableUserMoney);
-            club.setUserMoney(userMoney);
+            cmMallClub.setUserMoney(userMoney);
             //购物车数量
-            Integer count = homePageMapper.cartQuantity(club.getUserID());
+            Integer count = homePageMapper.cartQuantity(cmMallClub.getUserID());
             if (count == null) count = 0;
             logger.info("------------PersonalServiceImpl.myCentre.count:" + count);
-            club.setCartCount(count);
+            cmMallClub.setCartCount(count);
             //待付款数量
-            Integer paymentCount = personalMapper.findOrderCount(club.getUserID(), 1, operationUser.getUserOrganizeID());
+            Integer paymentCount = personalMapper.findOrderCount(cmMallClub.getUserID(), 1, operationUser.getUserOrganizeID());
             if (paymentCount == null) paymentCount = 0;
-            club.setPaymentCount(paymentCount);
+            cmMallClub.setPaymentCount(paymentCount);
             //待发货数量
-            Integer waitShipmentsCount = personalMapper.findOrderCount(club.getUserID(), 2, operationUser.getUserOrganizeID());
+            Integer waitShipmentsCount = personalMapper.findOrderCount(cmMallClub.getUserID(), 2, operationUser.getUserOrganizeID());
             if (waitShipmentsCount == null) waitShipmentsCount = 0;
-            club.setWaitShipmentsCount(waitShipmentsCount);
+            cmMallClub.setWaitShipmentsCount(waitShipmentsCount);
             //已发货数量
-            Integer shipmentsCount = personalMapper.findOrderCount(club.getUserID(), 3, operationUser.getUserOrganizeID());
+            Integer shipmentsCount = personalMapper.findOrderCount(cmMallClub.getUserID(), 3, operationUser.getUserOrganizeID());
             if (shipmentsCount == null) shipmentsCount = 0;
-            club.setShipmentsCount(shipmentsCount);
+            cmMallClub.setShipmentsCount(shipmentsCount);
             //退货款数量
-            Integer salesReturnCount = personalMapper.findOrderCount(club.getUserID(), 4, operationUser.getUserOrganizeID());
+            Integer salesReturnCount = personalMapper.findOrderCount(cmMallClub.getUserID(), 4, operationUser.getUserOrganizeID());
             if (salesReturnCount == null) salesReturnCount = 0;
-            club.setSalesReturnCount(salesReturnCount);
+            cmMallClub.setSalesReturnCount(salesReturnCount);
         }
-        return club;
+        return cmMallClub;
     }
 
     @Override
-    public Map<String, Object> touchBalance(Integer index, Integer pageSize, int year, int month, CmUserBalanceRecord balanceRecord) {
+    public Map<String, Object> touchBalance(Integer index, Integer pageSize, int year, int month, CmMallUserBalanceRecord balanceRecord) {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.YEAR, year);
@@ -72,27 +72,27 @@ public class PersonalServiceImpl implements PersonalService {
         if (index == null) index = 1;
         if (pageSize == null) pageSize = 10;
         PageHelper.startPage(index, pageSize);
-        List<CmUserBalanceRecord> list = personalMapper.touchBalance(balanceRecord);
-        Page<CmUserBalanceRecord> page = new Page<>(list);
+        List<CmMallUserBalanceRecord> list = personalMapper.touchBalance(balanceRecord);
+        CmMallPage<CmMallUserBalanceRecord> cmMallPage = 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("page", page);
+        map.put("cmMallPage", cmMallPage);
         map.put("ableUserMoney", userMoney);
         return map;
     }
 
     @Override
-    public List<Province> address() {
-        List<Province> list = personalMapper.findAllProvince();
-        for (Province province : list) {
-            List<City> cityList = personalMapper.findAllCity(province.getProvinceid());
-            province.setCitys(cityList);
-            if (cityList != null && cityList.size() > 0) {
-                for (City city : cityList) {
-                    List<Town> townList = personalMapper.findAllTown(city.getCityid());
-                    city.setTowns(townList);
+    public List<CmMallProvince> address() {
+        List<CmMallProvince> list = personalMapper.findAllProvince();
+        for (CmMallProvince cmMallProvince : list) {
+            List<CmMallCity> cmMallCityList = personalMapper.findAllCity(cmMallProvince.getProvinceid());
+            cmMallProvince.setCmMallCities(cmMallCityList);
+            if (cmMallCityList != null && cmMallCityList.size() > 0) {
+                for (CmMallCity cmMallCity : cmMallCityList) {
+                    List<CmMallTown> cmMallTownList = personalMapper.findAllTown(cmMallCity.getCityid());
+                    cmMallCity.setCmMallTowns(cmMallTownList);
                 }
             }
         }
@@ -100,48 +100,48 @@ public class PersonalServiceImpl implements PersonalService {
     }
 
     @Override
-    public List<Address> findAddress(Integer userID) {
-        List<Address> addressList = personalMapper.findAddress(userID);
-        for (Address address : addressList) {
-            Address cantonal = personalMapper.findCantonal(address.getTownID());
+    public List<CmMallAddress> findAddress(Integer userID) {
+        List<CmMallAddress> cmMallAddressList = personalMapper.findAddress(userID);
+        for (CmMallAddress cmMallAddress : cmMallAddressList) {
+            CmMallAddress cantonal = personalMapper.findCantonal(cmMallAddress.getTownID());
             if (cantonal != null) {
-                address.setProvince(cantonal.getProvince());
-                address.setCity(cantonal.getCity());
-                address.setTown(cantonal.getTown());
+                cmMallAddress.setProvince(cantonal.getProvince());
+                cmMallAddress.setCity(cantonal.getCity());
+                cmMallAddress.setTown(cantonal.getTown());
             }
         }
-        return addressList;
+        return cmMallAddressList;
     }
 
     @Override
-    public List<Province> getProvince() {
-        List<Province> list = personalMapper.findAllProvince();
+    public List<CmMallProvince> getProvince() {
+        List<CmMallProvince> list = personalMapper.findAllProvince();
         return list;
     }
 
     @Override
-    public List<City> getCity(Long provinceid) {
+    public List<CmMallCity> getCity(Long provinceid) {
         return personalMapper.findAllCity(provinceid);
     }
 
     @Override
-    public List<Town> getTown(Integer cityid) {
+    public List<CmMallTown> getTown(Integer cityid) {
         return personalMapper.findAllTown(cityid);
     }
 
     @Override
-    public void saveAddress(Address address) {
-        if (address.getDefaultFlag() != null && address.getDefaultFlag().equals("1")) {
-            Address addr = personalMapper.findDefaultAddress(address.getUserID());
+    public void saveAddress(CmMallAddress cmMallAddress) {
+        if (cmMallAddress.getDefaultFlag() != null && cmMallAddress.getDefaultFlag().equals("1")) {
+            CmMallAddress addr = personalMapper.findDefaultAddress(cmMallAddress.getUserID());
             if (addr != null) {
                 addr.setDefaultFlag("0");
                 personalMapper.updateAddress(addr);
             }
         }
-        if (address.getAddressID() == null) {
-            personalMapper.saveAddress(address);
+        if (cmMallAddress.getAddressID() == null) {
+            personalMapper.saveAddress(cmMallAddress);
         } else {
-            personalMapper.updateAddress(address);
+            personalMapper.updateAddress(cmMallAddress);
         }
     }
 
@@ -151,15 +151,15 @@ public class PersonalServiceImpl implements PersonalService {
     }
 
     @Override
-    public WxJsonModel invoice(UserInvoiceInfo userInvoiceInfo) {
-        WxJsonModel res = WxJsonModel.newInstance();
-        UserInvoiceInfo invoiceInfo = personalMapper.findInvoice(userInvoiceInfo.getUserId());
-        if (invoiceInfo == null && userInvoiceInfo.getInvoiceTitle() != null) {
-            personalMapper.invoice(userInvoiceInfo);
-        } else if (invoiceInfo != null && userInvoiceInfo.getInvoiceTitle() != null) {
-            personalMapper.updateInvoice(userInvoiceInfo);
+    public CmWxJsonModel invoice(CmMallUserInvoiceInfo cmMallUserInvoiceInfo) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
+        CmMallUserInvoiceInfo invoiceInfo = personalMapper.findInvoice(cmMallUserInvoiceInfo.getUserId());
+        if (invoiceInfo == null && cmMallUserInvoiceInfo.getInvoiceTitle() != null) {
+            personalMapper.invoice(cmMallUserInvoiceInfo);
+        } else if (invoiceInfo != null && cmMallUserInvoiceInfo.getInvoiceTitle() != null) {
+            personalMapper.updateInvoice(cmMallUserInvoiceInfo);
         }
-        UserInvoiceInfo info = personalMapper.findInvoice(userInvoiceInfo.getUserId());
+        CmMallUserInvoiceInfo info = personalMapper.findInvoice(cmMallUserInvoiceInfo.getUserId());
         return res.success(info);
     }
 }

src/main/java/com/caimei/utils/SessionHelper.java

@@ -1,6 +1,6 @@
 package com.caimei.utils;
 
-import com.caimei.entity.CmOperationUser;
+import com.caimei.entity.CmMallOperationUser;
 import com.caimei.service.user.LoginService;
 import com.opensymphony.xwork2.ActionContext;
 import org.apache.struts2.ServletActionContext;
@@ -60,11 +60,11 @@ public class SessionHelper {
 	 * @param request
 	 * @return
 	 */
-	public static CmOperationUser getCurrentUser( HttpServletRequest request){
+	public static CmMallOperationUser getCurrentUser(HttpServletRequest request){
 		HttpSession session = request.getSession();
 		String openid = (String) session.getAttribute("openid");
 		Integer organizeID = (Integer) session.getAttribute("organizeID");
-		CmOperationUser operationUser = loginService.doLogin(openid, organizeID);
+		CmMallOperationUser operationUser = loginService.doLogin(openid, organizeID);
 		return operationUser;
 	}
 

src/main/resources/mapper/AddressMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.user.AddressMapper">
+<mapper namespace="com.caimei.mapper.cmMallUser.AddressMapper">
    
    <sql id="aColumns">
    		a.addressID,
    		a.userID,
    		a.shouHuoRen,
    		a.townID,
-   		a.address AS "addressDetail",
+   		a.cmMallAddress AS "addressDetail",
    		a.postalCode,
    		a.phone,
    		a.mobile,
@@ -15,83 +15,83 @@
    		c.cityID,
    		p.provinceID,
    		t.name AS "town",
-   		c.name AS "city",
-   		p.name AS "province"
+   		c.name AS "cmMallCity",
+   		p.name AS "cmMallProvince"
 	</sql>
 	
 	 <sql id="aJoins">
 	 	LEFT JOIN town t ON t.townID=a.townID
-	 	LEFT JOIN city c ON c.cityID=t.cityID
-	 	LEFT JOIN province p ON p.provinceID=c.provinceID
+	 	LEFT JOIN cmMallCity c ON c.cityID=t.cityID
+	 	LEFT JOIN cmMallProvince p ON p.provinceID=c.provinceID
 	 </sql>
 
 
-	<select id="findByAddressID" resultType="com.caimei.entity.Address">
+	<select id="findByAddressID" resultType="com.caimei.entity.CmMallAddress">
 		SELECT
 		<include refid="aColumns"/>
-		FROM address a
+		FROM cmMallAddress a
 		<include refid="aJoins"/>
 		WHERE a.addressID=#{addressID}
 	</select>
 
 
-	<select id="get" resultType="com.caimei.entity.Address">
+	<select id="get" resultType="com.caimei.entity.CmMallAddress">
 		SELECT 
 			 <include refid="aColumns"/>
-		FROM address a
+		FROM cmMallAddress a
 		<include refid="aJoins"/>
 		WHERE a.addressID=#{addressID}
   	</select>
   	
-	<select id="findByUserId" resultType="com.caimei.entity.Address">
+	<select id="findByUserId" resultType="com.caimei.entity.CmMallAddress">
 		SELECT 
 			 <include refid="aColumns"/>
-		FROM address a
+		FROM cmMallAddress a
 		<include refid="aJoins"/>
 		WHERE a.userID=#{userID}
   	</select>
 
-	<select id="findByUserIdByAddress" resultType="com.caimei.entity.Address">
+	<select id="findByUserIdByAddress" resultType="com.caimei.entity.CmMallAddress">
 		SELECT
 		<include refid="aColumns"/>
-		FROM address a
+		FROM cmMallAddress a
 		<include refid="aJoins"/>
 		WHERE a.userID=#{userID}
 	</select>
   	
   	<update id="updateIsDefault">
-  		UPDATE address SET defaultFlag=1 WHERE addressID=#{addressID}
+  		UPDATE cmMallAddress SET defaultFlag=1 WHERE addressID=#{addressID}
   	</update>
   	
   	<update id="updateNoDefault">
-  		UPDATE address SET defaultFlag=0 WHERE userID=#{userID}
+  		UPDATE cmMallAddress SET defaultFlag=0 WHERE userID=#{userID}
   	</update>
 
   	<update id="updateUser">
-  		UPDATE address SET userID=#{newUserID} WHERE userID=#{oldUserId}
+  		UPDATE cmMallAddress SET userID=#{newUserID} WHERE userID=#{oldUserId}
   	</update>
 
   	<delete id="delete">
-  		DELETE FROM address WHERE addressID=#{addressID}
+  		DELETE FROM cmMallAddress WHERE addressID=#{addressID}
   	</delete>
   	
-  	<update id="update" parameterType="com.caimei.entity.Address">
-  		UPDATE address SET 
+  	<update id="update" parameterType="com.caimei.entity.CmMallAddress">
+  		UPDATE cmMallAddress SET
   			shouHuoRen=#{shouHuoRen},
   			mobile=#{mobile},
   			postalCode=#{postalCode},
   			townID=#{townID},
-  			address=#{addressDetail},
+  			cmMallAddress=#{addressDetail},
   			phone=#{phone}
   		WHERE addressID = #{addressID}
   	</update>
   	
-  	<insert id="insert" parameterType="com.caimei.entity.Address" keyProperty="addressID" useGeneratedKeys="true">
-  		INSERT INTO address(
+  	<insert id="insert" parameterType="com.caimei.entity.CmMallAddress" keyProperty="addressID" useGeneratedKeys="true">
+  		INSERT INTO cmMallAddress(
   				userID,
   				shouHuoRen,
   				townID,
-  				address,
+  				cmMallAddress,
   				postalCode,
   				mobile,
   				phone

src/main/resources/mapper/BpUserInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.caimei.mapper.order.BpUserInfoMapper" >
 
-    <select id="getUserInfo" resultType="com.caimei.entity.BpOrderUserInfo">
+    <select id="getUserInfo" resultType="com.caimei.entity.CmMallBpOrderUserInfo">
         SELECT
         a.id,
         a.orderId,
@@ -14,15 +14,15 @@
         a.phone,
         a.postalCode,
         a.townId,
-        a.province,
-        a.city,
+        a.cmMallProvince,
+        a.cmMallCity,
         a.town,
-        a.address
+        a.cmMallAddress
         FROM bp_order_userinfo a
         WHERE a.orderId = #{orderId}
     </select>
 
-    <update id="updateUserInfo" parameterType="com.caimei.entity.BpOrderUserInfo">
+    <update id="updateUserInfo" parameterType="com.caimei.entity.CmMallBpOrderUserInfo">
         UPDATE bp_order_userinfo SET
         orderId = #{orderId},
         clubId = #{clubId},
@@ -33,14 +33,14 @@
         phone = #{phone},
         postalCode = #{postalCode},
         townId = #{townId},
-        province = #{province},
-        city = #{city},
+        cmMallProvince = #{cmMallProvince},
+        cmMallCity = #{cmMallCity},
         town = #{town},
-        address = #{address}
+        cmMallAddress = #{cmMallAddress}
         WHERE id = #{id}
     </update>
 
-    <insert id="insertUserInfo" parameterType="com.caimei.entity.BpOrderUserInfo" keyProperty="id" useGeneratedKeys="true">
+    <insert id="insertUserInfo" parameterType="com.caimei.entity.CmMallBpOrderUserInfo" keyProperty="id" useGeneratedKeys="true">
         INSERT INTO bp_order_userinfo(
         orderId,
         clubId,
@@ -51,10 +51,10 @@
         phone,
         postalCode,
         townId,
-        province,
-        city,
+        cmMallProvince,
+        cmMallCity,
         town,
-        address
+        cmMallAddress
         ) VALUES (
         #{orderId},
         #{clubId},
@@ -65,10 +65,10 @@
         #{phone},
         #{postalCode},
         #{townId},
-        #{province},
-        #{city},
+        #{cmMallProvince},
+        #{cmMallCity},
         #{town},
-        #{address}
+        #{cmMallAddress}
         )
     </insert>
 

src/main/resources/mapper/CmShopOrderMapper.xml

@@ -58,14 +58,14 @@
 		a.splitFlag AS "splitFlag",
 		a.payStatus AS "payStatus",
 		a.sendOutStatus AS "sendOutStatus",
-		(SELECT name FROM shop s WHERE s.shopID = a.shopID) AS "shopName",
+		(SELECT name FROM cmMallShop s WHERE s.shopID = a.shopID) AS "shopName",
 		(SELECT IFNULL(SUM(totalAddedValueTax),0) FROM cm_order_product cop WHERE cop.shopOrderID = a.shopOrderID) AS "totalAddedValueTax"
 	</sql>
 	
 	<sql id="cmShopOrderJoins">
 	</sql>
     
-	<select id="get" resultType="com.caimei.entity.CmShopOrder">
+	<select id="get" resultType="com.caimei.entity.CmMallShopOrder">
 		SELECT
 			<include refid="cmShopOrderColumns"/>
 		FROM cm_shop_order a
@@ -73,7 +73,7 @@
 		WHERE a.shopOrderID = #{shopOrderID} AND a.delFlag = '0'
 	</select>
 
-	<select id="findList" resultType="com.caimei.entity.CmShopOrder">
+	<select id="findList" resultType="com.caimei.entity.CmMallShopOrder">
 		SELECT
 			<include refid="cmShopOrderColumns"/>
 		FROM cm_shop_order a
@@ -111,7 +111,7 @@
 			  ORDER BY a.shopOrderID DESC
 	</select>
 
-	<select id="findAllList" resultType="com.caimei.entity.CmShopOrder">
+	<select id="findAllList" resultType="com.caimei.entity.CmMallShopOrder">
 		SELECT 
 			<include refid="cmShopOrderColumns"/>
 		FROM cm_shop_order a
@@ -123,7 +123,7 @@
 		ORDER BY a.shopOrderID DESC
 	</select>
 	
-	<insert id="insert" parameterType="com.caimei.entity.CmShopOrder"  keyProperty="shopOrderID" useGeneratedKeys="true">
+	<insert id="insert" parameterType="com.caimei.entity.CmMallShopOrder" keyProperty="shopOrderID" useGeneratedKeys="true">
 		INSERT INTO cm_shop_order(
 			shopOrderNo,
 			orderNo,
@@ -286,7 +286,7 @@
 		WHERE shopOrderID = #{shopOrderID}
 	</delete>
 
-	<select id="listShopOrderByIDs" parameterType="String" resultType="com.caimei.entity.CmShopOrder">
+	<select id="listShopOrderByIDs" parameterType="String" resultType="com.caimei.entity.CmMallShopOrder">
 		SELECT * FROM cm_shop_order WHERE shopOrderID IN (#{shopOrderIDs})
 	</select>
 
@@ -319,15 +319,15 @@
 		WHERE shopOrderID = #{shopOrderID}
 	</update>
 
-	<select id="findByShopID" resultType="com.caimei.entity.CmShopOrder">
+	<select id="findByShopID" resultType="com.caimei.entity.CmMallShopOrder">
 		SELECT * FROM  cm_shop_order WHERE orderID = #{orderID} AND shopID = #{shopID}
 	</select>
 
-	<select id="findMaxShopOrderNo" resultType="com.caimei.entity.CmShopOrder">
+	<select id="findMaxShopOrderNo" resultType="com.caimei.entity.CmMallShopOrder">
 		SELECT * FROM  cm_shop_order WHERE orderID = #{orderID} ORDER BY shopOrderNo DESC
 	</select>
 
-	<insert id="insertCmShopOrder" parameterType="com.caimei.entity.CmShopOrder" >
+	<insert id="insertCmShopOrder" parameterType="com.caimei.entity.CmMallShopOrder" >
 		INSERT INTO cm_shop_order(
 		shopOrderID,
 		shopOrderNo,
@@ -482,7 +482,7 @@
 		</if>
 	</select>
 
-	<insert id="shopOrderBak" parameterType="com.caimei.entity.CmShopOrder"  keyProperty="shopOrderBakID" useGeneratedKeys="true">
+	<insert id="shopOrderBak" parameterType="com.caimei.entity.CmMallShopOrder" keyProperty="shopOrderBakID" useGeneratedKeys="true">
 		INSERT INTO cm_shop_order_bak(
 			orderID,
 			shopOrderNo,
@@ -572,7 +572,7 @@
 		)
 	</insert>
 
-	<select id="findListByOrderID" resultType="com.caimei.entity.CmShopOrder">
+	<select id="findListByOrderID" resultType="com.caimei.entity.CmMallShopOrder">
 		SELECT <include refid="cmShopOrderColumns"/>
 		FROM cm_shop_order a
 		WHERE a.orderID = #{orderID} ORDER BY a.shopOrderNo DESC

src/main/resources/mapper/DetailsMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.mapper.products.DetailsMapper">
-    <select id="findProduct" parameterType="int" resultType="com.caimei.entity.CmOrganizeProducts">
+    <select id="findProduct" parameterType="int" resultType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
           *
         FROM
@@ -13,18 +13,18 @@
           AND delFlag = '0'
     </select>
 
-    <select id="product" resultType="com.caimei.entity.Product" parameterType="int">
+    <select id="cmMallProduct" resultType="com.caimei.entity.CmMallProduct" parameterType="int">
         SELECT
           p.*,
           cb.name AS brandName
         FROM
-          product p
+          cmMallProduct p
           LEFT JOIN cm_brand cb ON p.brandID = cb.id
         WHERE
           productID = #{productID}
     </select>
 
-    <select id="findAllProductImage" parameterType="int" resultType="com.caimei.entity.ProductImage">
+    <select id="findAllProductImage" parameterType="int" resultType="com.caimei.entity.CmMallProductImage">
         SELECT
           *
         FROM
@@ -35,7 +35,7 @@
           mainFlag DESC
     </select>
 
-    <select id="findProductDetail" resultType="com.caimei.entity.ProductDetailInfo" parameterType="int">
+    <select id="findProductDetail" resultType="com.caimei.entity.CmMallProductDetailInfo" parameterType="int">
         SELECT
           *
         FROM
@@ -44,11 +44,11 @@
           productID = #{productID}
     </select>
 
-    <select id="findShop" parameterType="int" resultType="com.caimei.entity.Shop">
+    <select id="findShop" parameterType="int" resultType="com.caimei.entity.CmMallShop">
         SELECT
           *
         FROM
-          shop
+          cmMallShop
         WHERE
           shopID = #{shopID}
     </select>

src/main/resources/mapper/HomePageMapper.xml

@@ -3,7 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.mapper.products.HomePageMapper">
-    <select id="findClassify" resultType="com.caimei.entity.CmProductsClassify" parameterType="int">
+    <select id="findClassify" resultType="com.caimei.entity.CmMallProductsClassify" parameterType="int">
         SELECT
           *
         FROM
@@ -19,7 +19,7 @@
           id DESC
     </select>
 
-    <select id="findProducts" resultType="com.caimei.entity.CmOrganizeProducts" parameterType="int">
+    <select id="findProducts" resultType="com.caimei.entity.CmMallOrganizeProducts" parameterType="int">
         SELECT
           p.mainImage,
           p.name,
@@ -28,7 +28,7 @@
           cop.organizeID
         FROM
           cm_mall_organize_products cop
-          LEFT JOIN product p ON cop.productID = p.productID
+          LEFT JOIN cmMallProduct p ON cop.productID = p.productID
         WHERE
           cop.organizeID = #{organizeID}
           AND cop.commonlyProduct = '1'
@@ -61,8 +61,8 @@
           ) a
     </select>
 
-    <select id="classify" resultType="com.caimei.entity.CmOrganizeProducts"
-            parameterType="com.caimei.entity.CmOrganizeProducts">
+    <select id="classify" resultType="com.caimei.entity.CmMallOrganizeProducts"
+            parameterType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
           cmop.*,
           p.mainImage,
@@ -70,7 +70,7 @@
           p.unit
         FROM
           cm_mall_organize_products cmop
-          LEFT JOIN product p ON cmop.productID = p.productID
+          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
         WHERE
           cmop.classifyID = #{classifyID}
           AND cmop.organizeID= #{organizeID}
@@ -82,7 +82,7 @@
           cmop.id DESC
     </select>
 
-    <select id="preferred" parameterType="int" resultType="com.caimei.entity.CmOrganizeProducts">
+    <select id="preferred" parameterType="int" resultType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
         cmop.*,
         p.mainImage,
@@ -90,7 +90,7 @@
         p.unit
         FROM
         cm_mall_organize_products cmop
-        LEFT JOIN product p ON cmop.productID = p.productID
+        LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
         <where>
             <if test="preferredProduct != null and preferredProduct != ''">
                 AND cmop.preferredProduct = '1'
@@ -120,7 +120,7 @@
         </if>
     </select>
 
-    <select id="member" resultType="com.caimei.entity.hospital">
+    <select id="member" resultType="com.caimei.entity.CmMallHospital">
         SELECT
           zh.*
         FROM
@@ -135,7 +135,7 @@
           zh.sort DESC,COUNT(zhb.brandID) DESC,zh.id DESC
     </select>
 
-    <select id="findId" resultType="com.caimei.entity.brand" parameterType="int">
+    <select id="findId" resultType="com.caimei.entity.CmMallBrand" parameterType="int">
         SELECT
           b.*
         FROM

src/main/resources/mapper/LoginMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.user.LoginMapper">
-    <select id="doLogin" resultType="com.caimei.entity.CmOperationUser">
+<mapper namespace="com.caimei.mapper.cmMallUser.LoginMapper">
+    <select id="doLogin" resultType="com.caimei.entity.CmMallOperationUser">
         SELECT
           cou.*
         FROM
@@ -16,7 +16,7 @@
           AND u.clubStatus = '90'
     </select>
 
-    <select id="isEnabled" resultType="com.caimei.entity.CmOperationUser">
+    <select id="isEnabled" resultType="com.caimei.entity.CmMallOperationUser">
         SELECT
           cou.*,
           u.clubStatus
@@ -28,7 +28,7 @@
           AND cou.userOrganizeID = #{userOrganizeID}
     </select>
 
-    <update id="update" parameterType="com.caimei.entity.CmOperationUser">
+    <update id="update" parameterType="com.caimei.entity.CmMallOperationUser">
         UPDATE
           cm_mall_operation_user
         SET
@@ -42,7 +42,7 @@
           AND delFlag = '0'
     </update>
 
-    <update id="updateOperationUser" parameterType="com.caimei.entity.CmOperationUser">
+    <update id="updateOperationUser" parameterType="com.caimei.entity.CmMallOperationUser">
         UPDATE
           cm_mall_operation_user
         SET
@@ -56,7 +56,7 @@
           AND userOrganizeID = #{userOrganizeID}
     </update>
 
-    <select id="query" parameterType="com.caimei.entity.CmOperationUser" resultType="com.caimei.entity.CmOperationUser">
+    <select id="query" parameterType="com.caimei.entity.CmMallOperationUser" resultType="com.caimei.entity.CmMallOperationUser">
         SELECT
           cou.*
         FROM

src/main/resources/mapper/OrderMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.mapper.order.OrderMapper">
 
-    <insert id="insert" parameterType="com.caimei.entity.CmOrder"  keyProperty="orderID" useGeneratedKeys="true">
+    <insert id="insert" parameterType="com.caimei.entity.CmMallOrder" keyProperty="orderID" useGeneratedKeys="true">
         INSERT INTO cm_order(
         orderNo,
         organizeID,
@@ -163,7 +163,7 @@
           AND delFlag = '0'
     </select>
 
-    <select id="queryFree" resultType="com.caimei.entity.FreePostageCard" parameterType="int">
+    <select id="queryFree" resultType="com.caimei.entity.CmMallFreePostageCard" parameterType="int">
         SELECT
           *
         FROM
@@ -198,13 +198,13 @@
           )
     </insert>
 
-    <select id="findShop" resultType="com.caimei.entity.Shop">
+    <select id="findShop" resultType="com.caimei.entity.CmMallShop">
         SELECT
            s.*
         FROM
           cm_mall_organize_products cmop
-          LEFT JOIN product p ON cmop.productID = p.productID
-          LEFT JOIN shop s ON p.shopID = s.shopID
+          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
+          LEFT JOIN cmMallShop s ON p.shopID = s.shopID
           LEFT JOIN cm_mall_cart cmc ON cmop.id = cmc.productID
         WHERE
           cmop.id IN
@@ -218,7 +218,7 @@
           MAX(cmc.addTime) DESC
     </select>
 
-    <select id="findAllCommodity" resultType="com.caimei.entity.CmOrganizeProducts">
+    <select id="findAllCommodity" resultType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
           cmop.*,
           p.mainImage,
@@ -228,7 +228,7 @@
         FROM
           cm_mall_organize_products cmop
           LEFT JOIN cm_mall_cart cmc ON cmop.id = cmc.productID
-          LEFT JOIN product p ON cmop.productID = p.productID
+          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
         WHERE
           p.shopID = #{shopID}
           AND cmc.userID = #{userId}
@@ -241,7 +241,7 @@
           cmc.addTime DESC
     </select>
 
-    <select id="findCommodity" resultType="com.caimei.entity.CmOrganizeProducts">
+    <select id="findCommodity" resultType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
           cmop.*,
           p.mainImage,
@@ -249,13 +249,13 @@
           p.unit
         FROM
           cm_mall_organize_products cmop
-          LEFT JOIN product p ON cmop.productID = p.productID
+          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
         WHERE
           p.shopID = #{shopID}
           AND cmop.id = #{productIDs}
     </select>
 
-    <select id="findUserInfo" resultType="com.caimei.entity.BpOrderUserInfo" parameterType="int">
+    <select id="findUserInfo" resultType="com.caimei.entity.CmMallBpOrderUserInfo" parameterType="int">
         SELECT
           *
         FROM
@@ -264,7 +264,7 @@
           orderId = #{orderId}
     </select>
 
-    <select id="findOrder" parameterType="int" resultType="com.caimei.entity.CmOrder">
+    <select id="findOrder" parameterType="int" resultType="com.caimei.entity.CmMallOrder">
         SELECT
           *
         FROM
@@ -274,14 +274,14 @@
           AND delFlag = '0'
     </select>
 
-    <select id="findAllShopOrder" resultType="com.caimei.entity.CmShopOrder">
+    <select id="findAllShopOrder" resultType="com.caimei.entity.CmMallShopOrder">
         SELECT
           cso.*,
           s.name AS shopName,
           s.logo AS shopLogo
         FROM
           cm_shop_order cso
-          LEFT JOIN shop s ON cso.shopID = s.shopID
+          LEFT JOIN cmMallShop s ON cso.shopID = s.shopID
         WHERE
           cso.shopOrderID IN
           <foreach collection="array" item="shopOrderID" index="index" open="(" separator="," close=")">
@@ -290,18 +290,18 @@
           AND cso.delFlag = '0'
     </select>
 
-    <select id="findOrderProduct" resultType="com.caimei.entity.CmOrderProduct" parameterType="int">
+    <select id="findOrderProduct" resultType="com.caimei.entity.CmMallOrderProduct" parameterType="int">
         SELECT
           cop.*,
-          p.mainImage AS productImage
+          p.mainImage AS cmMallProductImage
         FROM
           cm_order_product cop
-          LEFT JOIN product p ON cop.productID = p.productID
+          LEFT JOIN cmMallProduct p ON cop.productID = p.productID
         WHERE
           shopOrderID = #{shopOrderID}
     </select>
 
-    <select id="findDiscernReceipt" parameterType="int" resultType="com.caimei.entity.CmDiscernReceipt">
+    <select id="findDiscernReceipt" parameterType="int" resultType="com.caimei.entity.CmMallDiscernReceipt">
         SELECT
           cdr.*,cror.associateAmount
         FROM
@@ -317,7 +317,7 @@
           cdr.receiptDate DESC
     </select>
 
-    <select id="findReturnedPurchase" resultType="com.caimei.entity.CmReturnedPurchase" parameterType="int">
+    <select id="findReturnedPurchase" resultType="com.caimei.entity.CmMallReturnedPurchase" parameterType="int">
         SELECT
           *
         FROM
@@ -329,7 +329,7 @@
           confirmReturnTime DESC
     </select>
 
-    <select id="findLogisticsInfo" parameterType="int" resultType="com.caimei.entity.LogisticsInfo">
+    <select id="findLogisticsInfo" parameterType="int" resultType="com.caimei.entity.CmMallLogisticsInfo">
         SELECT DISTINCT
         li.*,
         clb.deliveryTime
@@ -341,7 +341,7 @@
           li.logisticsBatchID = #{logisticsBatchID}
     </select>
 
-    <select id="findLogisticsRecord" resultType="com.caimei.entity.CmLogisticsRecord" parameterType="int">
+    <select id="findLogisticsRecord" resultType="com.caimei.entity.CmMallLogisticsRecord" parameterType="int">
         SELECT
           clr.*,
           cop.organizeProductID
@@ -378,7 +378,7 @@
           )
     </insert>
 
-    <select id="findAllOrder" resultType="com.caimei.entity.CmOrder">
+    <select id="findAllOrder" resultType="com.caimei.entity.CmMallOrder">
         SELECT
           *
         FROM
@@ -414,7 +414,7 @@
           AND expiredTime > NOW()
     </select>
 
-    <select id="oftenPurchase" resultType="com.caimei.entity.CmOrganizeProducts">
+    <select id="oftenPurchase" resultType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
           cmop.*,
           p.mainImage,
@@ -424,7 +424,7 @@
           cm_order co
           LEFT JOIN cm_order_product cop ON co.orderID = cop.orderID
           LEFT JOIN cm_mall_organize_products cmop ON cmop.id = cop.organizeProductID
-          LEFT JOIN product p ON cmop.productID = p.productID
+          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
         WHERE
           co.delFlag = '0'
           AND co.status NOT IN(6, 7)
@@ -454,7 +454,7 @@
           id =  #{id}
     </update>
 
-    <select id="findPayShopRecord" resultType="com.caimei.entity.CmPayShopRecord" parameterType="int">
+    <select id="findPayShopRecord" resultType="com.caimei.entity.CmMallPayShopRecord" parameterType="int">
         SELECT
           *
         FROM
@@ -494,7 +494,7 @@
     </update>
 
     <!--获取订单发票信息-->
-    <select id="getOrderInvoice" resultType="com.caimei.entity.OrderInvoice">
+    <select id="getOrderInvoice" resultType="com.caimei.entity.CmMallOrderInvoice">
         SELECT
         a.*
         FROM bp_order_invoice a
@@ -502,7 +502,7 @@
     </select>
 
     <!--保存订单发票信息-->
-    <insert id="insertOrderInvoice" parameterType="com.caimei.entity.OrderInvoice">
+    <insert id="insertOrderInvoice" parameterType="com.caimei.entity.CmMallOrderInvoice">
         INSERT INTO bp_order_invoice(
         orderId,
         invoiceTitle,
@@ -547,11 +547,11 @@
           and logisticsBatchID = #{id}
     </select>
 
-    <select id="findLogistics" resultType="com.caimei.entity.CmLogisticsBatch" parameterType="int">
+    <select id="findLogistics" resultType="com.caimei.entity.CmMallLogisticsBatch" parameterType="int">
         SELECT * FROM cm_logistics_batch WHERE orderID= #{orderID}
     </select>
 
-    <select id="findClassifyID" resultType="com.caimei.entity.CmProductsClassify">
+    <select id="findClassifyID" resultType="com.caimei.entity.CmMallProductsClassify">
         SELECT
           *
         FROM

src/main/resources/mapper/OrderProductMapper.xml

@@ -56,14 +56,14 @@
 			a.preferential AS "preferential",
 			a.actPreferential AS "actPreferential",
 			a.actType AS "actType",
-			a.productImage AS productImage,
+			a.cmMallProductImage AS cmMallProductImage,
 			a.productUnit AS productUnit
 		</sql>
 
 		<sql id="cmOrderProductJoins">
 		</sql>
 
-		<select id="get" resultType="com.caimei.entity.CmOrderProduct">
+		<select id="get" resultType="com.caimei.entity.CmMallOrderProduct">
 			SELECT
 			<include refid="cmOrderProductColumns"/>
 			FROM cm_order_product a
@@ -72,7 +72,7 @@
 		</select>
 
 
-		<select id="findList" resultType="com.caimei.entity.CmOrderProduct">
+		<select id="findList" resultType="com.caimei.entity.CmMallOrderProduct">
 			SELECT
 			<include refid="cmOrderProductColumns"/>
 			FROM cm_order_product a
@@ -110,7 +110,7 @@
 			ORDER BY a.orderProductID
 		</select>
 
-		<select id="findAllList" resultType="com.caimei.entity.CmOrderProduct">
+		<select id="findAllList" resultType="com.caimei.entity.CmMallOrderProduct">
 			SELECT
 			<include refid="cmOrderProductColumns"/>
 			FROM cm_order_product a
@@ -121,7 +121,7 @@
 			ORDER BY a.orderProductID
 		</select>
 
-		<select id="findReturnedPurchaseList" resultType="CmReturnedPurchase">
+		<select id="findReturnedPurchaseList" resultType="com.caimei.entity.CmMallReturnedPurchase">
 			SELECT
 			*
 			FROM cm_returned_purchase a
@@ -137,7 +137,7 @@
 		</select>
 
 
-		<insert id="insert" parameterType="com.caimei.entity.CmOrderProduct"  keyProperty="orderProductID" useGeneratedKeys="true">
+		<insert id="insert" parameterType="com.caimei.entity.CmMallOrderProduct" keyProperty="orderProductID" useGeneratedKeys="true">
 			INSERT INTO cm_order_product(
 			orderNo,
 			orderID,
@@ -191,7 +191,7 @@
 			preferential,
 			actPreferential,
 			actType,
-			productImage,
+			cmMallProductImage,
 			productUnit
 			) VALUES (
 			#{orderNo},
@@ -246,7 +246,7 @@
 			#{preferential},
 			#{actPreferential},
 			#{actType},
-			#{productImage},
+			#{cmMallProductImage},
 			#{productUnit}
 			)
 		</insert>
@@ -305,7 +305,7 @@
 			preferential = #{preferential},
 			actPreferential = #{actPreferential},
 			actType = #{actType},
-			productImage = #{productImage},
+			cmMallProductImage = #{cmMallProductImage},
 			productUnit = #{productUnit}
 			WHERE orderProductID = #{orderProductID}
 		</update>
@@ -323,7 +323,7 @@
 			AND op.shopOrderID = #{shopOrderID}
 		</select>
 
-		<select id="getOrderProductDetail" resultType="com.caimei.entity.CmOrderProduct" parameterType="com.caimei.entity.CmOrderProduct">
+		<select id="getOrderProductDetail" resultType="com.caimei.entity.CmMallOrderProduct" parameterType="com.caimei.entity.CmMallOrderProduct">
 			SELECT
 			<include refid="cmOrderProductColumns"/>
 			FROM cm_order_product a
@@ -335,11 +335,11 @@
 			ORDER BY a.orderProductID ASC
 		</select>
 
-		<select id="findByShopID" resultType="com.caimei.entity.CmOrderProduct">
+		<select id="findByShopID" resultType="com.caimei.entity.CmMallOrderProduct">
 			SELECT `cm_order_product` WHERE shopID = #{shopID} AND orderID = #{orderID}
 		</select>
 
-		<select id="findByOrderIdGroupByShopId" resultType="com.caimei.entity.CmOrderProduct">
+		<select id="findByOrderIdGroupByShopId" resultType="com.caimei.entity.CmMallOrderProduct">
 			SELECT
 			<include refid="cmOrderProductColumns"/>
 			FROM cm_order_product a
@@ -351,7 +351,7 @@
 			SELECT GROUP_CONCAT(orderProductID) FROM `cm_order_product` where orderID = #{orderID}
 		</select>
 
-		<select id="findByIds" resultType="CmOrderProduct">
+		<select id="findByIds" resultType="com.caimei.entity.CmMallOrderProduct">
 			SELECT
 			<include refid="cmOrderProductColumns"/>
 			FROM cm_order_product a
@@ -363,7 +363,7 @@
 			ORDER BY a.orderProductID ASC
 		</select>
 
-		<select id="findByIdsAndOrderId" resultType="com.caimei.entity.CmOrderProduct">
+		<select id="findByIdsAndOrderId" resultType="com.caimei.entity.CmMallOrderProduct">
 			SELECT
 			<include refid="cmOrderProductColumns"/>
 			FROM cm_order_product a
@@ -376,7 +376,7 @@
 			ORDER BY a.orderProductID ASC
 		</select>
 
-		<select id="findByOrderProductID" resultType="com.caimei.entity.CmOrderProduct" useCache="false" flushCache="true">
+		<select id="findByOrderProductID" resultType="com.caimei.entity.CmMallOrderProduct" useCache="false" flushCache="true">
 			SELECT
 			<include refid="cmOrderProductColumns"/>
 			FROM cm_order_product a

src/main/resources/mapper/OrganizeProductsMapper.xml

@@ -30,12 +30,12 @@
 	</sql>
 	
 	<sql id="cmMallOrganizeProductsJoins">
-		LEFT JOIN product p on p.productID = a.productID
-		LEFT JOIN shop s on s.shopID = p.shopID
+		LEFT JOIN cmMallProduct p on p.productID = a.productID
+		LEFT JOIN cmMallShop s on s.shopID = p.shopID
 		LEFT JOIN cm_mall_products_classify cmpc on cmpc.id = a.classifyID
 	</sql>
     
-	<select id="selectProductById" resultType="com.caimei.entity.CmOrganizeProducts">
+	<select id="selectProductById" resultType="com.caimei.entity.CmMallOrganizeProducts">
 		SELECT 
 			<include refid="cmMallOrganizeProductsColumns"/>
 		FROM cm_mall_organize_products a
@@ -44,14 +44,14 @@
 	</select>
 
     <!--获取采美商品信息-->
-    <select id="selectCmProductById" resultType="com.caimei.entity.Product">
+    <select id="selectCmProductById" resultType="com.caimei.entity.CmMallProduct">
         SELECT
         a.*
-        FROM product a
+        FROM cmMallProduct a
         WHERE a.productID = #{productID}
     </select>
 
-    <insert id="insert" parameterType="com.caimei.entity.CmOrderProduct"  keyProperty="orderProductID" useGeneratedKeys="true">
+    <insert id="insert" parameterType="com.caimei.entity.CmMallOrderProduct" keyProperty="orderProductID" useGeneratedKeys="true">
         INSERT INTO cm_order_product(
         orderNo,
         orderID,
@@ -107,7 +107,7 @@
         preferential,
         actPreferential,
         actType,
-        productImage,
+        cmMallProductImage,
         productUnit
         ) VALUES (
         #{orderNo},
@@ -164,7 +164,7 @@
         #{preferential},
         #{actPreferential},
         #{actType},
-        #{productImage},
+        #{cmMallProductImage},
         #{productUnit}
         )
     </insert>
@@ -224,7 +224,7 @@
 			preferential = #{preferential},
 			actPreferential = #{actPreferential},
 			actType = #{actType},
-			productImage = #{productImage},
+			cmMallProductImage = #{cmMallProductImage},
 			productUnit = #{productUnit}
 			WHERE orderProductID = #{orderProductID}
 		</update>

src/main/resources/mapper/PersonalMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei.mapper.user.PersonalMapper">
-    <select id="myCentre" parameterType="com.caimei.entity.CmOperationUser" resultType="com.caimei.entity.Club">
+<mapper namespace="com.caimei.mapper.cmMallUser.PersonalMapper">
+    <select id="myCentre" parameterType="com.caimei.entity.CmMallOperationUser" resultType="com.caimei.entity.CmMallClub">
         SELECT
           c.name,
           c.userID,
@@ -15,7 +15,7 @@
         FROM
           cm_mall_operation_user cou
           LEFT JOIN USER u ON u.userID = cou.userID
-          LEFT JOIN club c ON u.clubID = c.clubID
+          LEFT JOIN cmMallClub c ON u.clubID = c.clubID
           LEFT JOIN cm_mall_organize cuo ON cuo.id=cou.userOrganizeID
         WHERE
           cou.openid = #{openid}
@@ -23,7 +23,7 @@
           AND cou.delFlag = '0'
     </select>
 
-    <select id="touchBalance" resultType="com.caimei.entity.CmUserBalanceRecord">
+    <select id="touchBalance" resultType="com.caimei.entity.CmMallUserBalanceRecord">
         SELECT
         cubr.*
         FROM
@@ -44,31 +44,31 @@
         SELECT ableUserMoney FROM USER WHERE userID = #{userID}
     </select>
 
-    <select id="findAllProvince" resultType="com.caimei.entity.Province">
-        SELECT * FROM province WHERE validFlag = '1'
+    <select id="findAllProvince" resultType="com.caimei.entity.CmMallProvince">
+        SELECT * FROM cmMallProvince WHERE validFlag = '1'
     </select>
 
-    <select id="findAllCity" resultType="com.caimei.entity.City">
-        SELECT * FROM city WHERE provinceID = #{provinceID} AND validFlag = '1'
+    <select id="findAllCity" resultType="com.caimei.entity.CmMallCity">
+        SELECT * FROM cmMallCity WHERE provinceID = #{provinceID} AND validFlag = '1'
     </select>
 
-    <select id="findAllTown" resultType="com.caimei.entity.Town">
+    <select id="findAllTown" resultType="com.caimei.entity.CmMallTown">
         SELECT * FROM town WHERE cityID = #{cityID} AND validFlag = '1'
     </select>
 
-    <select id="findAddress" resultType="com.caimei.entity.Address">
+    <select id="findAddress" resultType="com.caimei.entity.CmMallAddress">
         SELECT
           addressID,
           userID,
           shouHuoRen,
           townID,
-          address AS addressDetail,
+          cmMallAddress AS addressDetail,
           postalCode,
           phone,
           mobile,
           defaultFlag
         FROM
-          address
+          cmMallAddress
         WHERE
           userID = #{userID}
         ORDER BY
@@ -76,15 +76,15 @@
           addressID ASC
     </select>
 
-    <select id="findCantonal" resultType="com.caimei.entity.Address">
+    <select id="findCantonal" resultType="com.caimei.entity.CmMallAddress">
         SELECT
-          p.name AS province,
-          c.name AS city,
+          p.name AS cmMallProvince,
+          c.name AS cmMallCity,
           t.name AS town
         FROM
           town t
-          LEFT JOIN city c ON t.cityID = c.cityID
-          LEFT JOIN province p ON p.provinceID = c.provinceID
+          LEFT JOIN cmMallCity c ON t.cityID = c.cityID
+          LEFT JOIN cmMallProvince p ON p.provinceID = c.provinceID
         WHERE
           t.townID = #{townID}
           AND t.validFlag = '1'
@@ -92,9 +92,9 @@
           AND p.validFlag = '1'
     </select>
 
-    <insert id="saveAddress" parameterType="com.caimei.entity.Address">
-        INSERT INTO address (
-          userID, shouHuoRen, townID, address,
+    <insert id="saveAddress" parameterType="com.caimei.entity.CmMallAddress">
+        INSERT INTO cmMallAddress (
+          userID, shouHuoRen, townID, cmMallAddress,
           mobile, defaultFlag
         )
         VALUES
@@ -104,13 +104,13 @@
           )
     </insert>
 
-    <update id="updateAddress" parameterType="com.caimei.entity.Address">
+    <update id="updateAddress" parameterType="com.caimei.entity.CmMallAddress">
         UPDATE
-          address
+          cmMallAddress
         SET
           shouHuoRen =#{shouHuoRen},
           townID = #{townID},
-          address = #{addressDetail},
+          cmMallAddress = #{addressDetail},
           mobile = #{mobile},
           defaultFlag = #{defaultFlag}
         WHERE
@@ -118,28 +118,28 @@
     </update>
 
     <delete id="deleteAddress" parameterType="int">
-        DELETE FROM address WHERE addressID = #{addressID} 
+        DELETE FROM cmMallAddress WHERE addressID = #{addressID}
     </delete>
 
-    <select id="findDefaultAddress" resultType="com.caimei.entity.Address">
+    <select id="findDefaultAddress" resultType="com.caimei.entity.CmMallAddress">
         SELECT
           addressID,
           userID,
           shouHuoRen,
           townID,
-          address AS addressDetail,
+          cmMallAddress AS addressDetail,
           postalCode,
           phone,
           mobile,
           defaultFlag
         FROM
-          address
+          cmMallAddress
         WHERE
           userID = #{userID}
           AND defaultFlag = '1'
     </select>
 
-    <select id="findInvoice" parameterType="int" resultType="com.caimei.entity.UserInvoiceInfo">
+    <select id="findInvoice" parameterType="int" resultType="com.caimei.entity.CmMallUserInvoiceInfo">
         SELECT
           *
         FROM
@@ -148,7 +148,7 @@
           userId = #{userId}
     </select>
 
-    <insert id="invoice" parameterType="com.caimei.entity.UserInvoiceInfo">
+    <insert id="invoice" parameterType="com.caimei.entity.CmMallUserInvoiceInfo">
         INSERT INTO cm_user_invoiceinfo (
           userId, invoiceTitle, corporationTaxNum,
           registeredAddress, registeredPhone,
@@ -162,7 +162,7 @@
           )
     </insert>
 
-    <update id="updateInvoice" parameterType="com.caimei.entity.UserInvoiceInfo">
+    <update id="updateInvoice" parameterType="com.caimei.entity.CmMallUserInvoiceInfo">
         UPDATE
           cm_user_invoiceinfo
         SET

src/main/resources/mapper/ShoppingMapper.xml

@@ -3,14 +3,14 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.mapper.products.ShoppingMapper">
-    <select id="findAllShop" resultType="com.caimei.entity.Shop" parameterType="int">
+    <select id="findAllShop" resultType="com.caimei.entity.CmMallShop" parameterType="int">
         SELECT
           s.*
         FROM
           cm_mall_cart cmc
           LEFT JOIN cm_mall_organize_products cmop ON cmop.id = cmc.productID
-          LEFT JOIN product p ON cmop.productID = p.productID
-          LEFT JOIN shop s ON p.shopID = s.shopID
+          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
+          LEFT JOIN cmMallShop s ON p.shopID = s.shopID
         WHERE
           cmc.userID = #{userID}
           AND cmc.delFlag = '0'
@@ -20,7 +20,7 @@
           MAX(cmc.addTime) DESC
     </select>
 
-    <select id="findAllProducts" resultType="com.caimei.entity.CmOrganizeProducts" parameterType="int">
+    <select id="findAllProducts" resultType="com.caimei.entity.CmMallOrganizeProducts" parameterType="int">
         SELECT
           cmop.*,
           p.mainImage,
@@ -30,7 +30,7 @@
         FROM
           cm_mall_cart cmc
           LEFT JOIN cm_mall_organize_products cmop ON cmop.id = cmc.productID
-          LEFT JOIN product p ON cmop.productID = p.productID
+          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
         WHERE
           p.shopID = #{shopID}
           AND cmc.userID = #{userID}

src/main/resources/mapper/UserMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.caimei.mapper.user.UserMapper" >
+<mapper namespace="com.caimei.mapper.cmMallUser.UserMapper" >
 
-	<select id="findUserById" resultType="com.caimei.entity.User">
-		SELECT * FROM user WHERE userID = #{userId}
+	<select id="findUserById" resultType="com.caimei.entity.CmMallUser">
+		SELECT * FROM cmMallUser WHERE userID = #{userId}
 	</select>
 
 	<update id="updateBalanceRecord">
@@ -13,7 +13,7 @@
 		WHERE userId = #{userId} AND orderId = #{orderId}
 	</update>
 
-	<insert id="insertUserBalanceRecord" parameterType="com.caimei.entity.CmUserBalanceRecord"  keyProperty="id" useGeneratedKeys="true">
+	<insert id="insertUserBalanceRecord" parameterType="com.caimei.entity.CmMallUserBalanceRecord" keyProperty="id" useGeneratedKeys="true">
 		INSERT INTO cm_user_balance_record(
 		userId,
 		type,
@@ -39,11 +39,11 @@
 		)
 	</insert>
 
-	<update id="updateAbleUserMoney" parameterType="com.caimei.entity.User">
-		UPDATE user SET ableUserMoney=#{ableUserMoney} WHERE userID=#{userID}
+	<update id="updateAbleUserMoney" parameterType="com.caimei.entity.CmMallUser">
+		UPDATE cmMallUser SET ableUserMoney=#{ableUserMoney} WHERE userID=#{userID}
 	</update>
 
-	<update id="updateUserMoney" parameterType="com.caimei.entity.User">
-		UPDATE user SET userMoney=#{userMoney} WHERE userID=#{userID}
+	<update id="updateUserMoney" parameterType="com.caimei.entity.CmMallUser">
+		UPDATE cmMallUser SET userMoney=#{userMoney} WHERE userID=#{userID}
 	</update>
 </mapper>