Merge branch 'developer' of git_lijun/caimei-mall into developer

pom.xml

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.4.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
 
     <groupId>com.caimei</groupId>
     <artifactId>caimei-mall</artifactId>
@@ -14,13 +19,19 @@
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.9.RELEASE</version>
-    </parent>
-
     <dependencies>
+
+        <dependency>
+            <groupId>com.caimei.module</groupId>
+            <artifactId>caimei-search</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+
         <!--spring Boot原始依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -36,14 +47,12 @@
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>1.3.1</version>
+            <version>2.1.1</version>
         </dependency>
-
-        <!-- mysql的依赖 -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.21</version>
+            <version>8.0.18</version>
         </dependency>
 
         <dependency>
@@ -90,7 +99,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
     </dependencies>
 
     <profiles>
@@ -136,7 +144,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>1.5.2.RELEASE</version>
                 <configuration>
                     <mainClass>com.caimei.StartApplication</mainClass><!--springboot启动类目录-->
                 </configuration>
@@ -153,4 +160,4 @@
     </build>
 
 
-</project>
+</project>

src/main/java/com/caimei/StartApplication.java

@@ -1,13 +1,15 @@
 package com.caimei;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.caimei.module.service", "com.caimei.controller.**", "com.caimei.service.**"})
+@MapperScan(basePackages = {"com.caimei.module.dao", "com.caimei.mapper.**"})
 public class StartApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(StartApplication.class, args);
     }
 
-}
+}

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

@@ -12,7 +12,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,10 +36,8 @@ public class OrderController {
     private OrderService orderService;
     @Autowired
     private LoginService loginService;
-    @Value("${miniprogram.AppId}")
-    private String AppId;
-    @Value("${miniprogram.AppSecret}")
-    private String AppSecret;
+    @Autowired
+    private Environment env;
 
     /**
      * 确认订单信息
@@ -48,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);
     }
 
     /**
@@ -60,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);
@@ -76,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"); //获取当前微信小程序的环境
@@ -86,8 +84,8 @@ public class OrderController {
         map.put("referer", referer);
         String requestUrl = "https://api.weixin.qq.com/sns/jscode2session";
         Map<String, String> requestUrlParam = new HashMap<String, String>();
-        requestUrlParam.put("appid", AppId);//小程序appId
-        requestUrlParam.put("secret", AppSecret);//小程序appsecret
+        requestUrlParam.put("appid", env.getProperty("miniprogram.AppId" + organizeID));//小程序appId
+        requestUrlParam.put("secret", env.getProperty("miniprogram.AppSecret" + organizeID));//小程序appsecret
         requestUrlParam.put("js_code", code);//小程序端返回的code
         requestUrlParam.put("grant_type", "authorization_code");//默认参数
         //发送post请求读取调用微信接口获取openid用户唯一标识
@@ -116,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;
     }
 
@@ -125,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);
@@ -158,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");
@@ -190,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", "数据异常");
 
         }
     }
@@ -224,10 +222,16 @@ public class OrderController {
      */
     @ResponseBody
     @RequestMapping("/logistics")
-    public WxJsonModel logistics(Integer orderID) {
-        WxJsonModel model = WxJsonModel.newInstance();
-        List<CmShopOrder> shopOrderList = orderService.logistics(orderID);
-        return model.success(shopOrderList);
+    public CmWxJsonModel logistics(Integer orderID) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        List<CmMallLogisticsBatch> logistics = null;
+        try {
+            logistics = orderService.logistics(orderID);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return model.success(logistics);
     }
 
     /**
@@ -238,14 +242,14 @@ 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);
+        List<CmMallOrder> orderList = orderService.myOrder(userID, orderState, organizeID);
+        CmMallPage<CmMallOrder> page = new CmMallPage<>(orderList);
         return model.success(page);
     }
 
@@ -254,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);
@@ -266,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) {
@@ -281,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) {
@@ -296,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

@@ -1,6 +1,7 @@
 package com.caimei.controller.products;
 
 import com.caimei.entity.*;
+import com.caimei.entity.CmMallOrganizeProducts;
 import com.caimei.service.products.HomePageService;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,9 +29,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 +41,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> page = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(page);
     }
 
     /**
@@ -56,13 +57,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> page = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(page);
     }
 
     /**
@@ -72,13 +73,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> page = new CmMallPage<>(member);
+        return CmWxJsonModel.newInstance().success(page);
     }
 
     /**
@@ -88,8 +89,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/search/SearchController.java

@@ -0,0 +1,188 @@
+package com.caimei.controller.search;
+
+import com.caimei.controller.user.LoginController;
+import com.caimei.entity.*;
+import com.caimei.mapper.order.OrderMapper;
+
+import com.caimei.module.entity.vo.*;
+import com.caimei.module.service.SearchService;
+import com.caimei.utils.AppUtils;
+import com.caimei.utils.CopyUtil;
+import com.github.pagehelper.PageHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 搜索
+ */
+@Controller
+@RequestMapping("/search")
+public class SearchController {
+    @Autowired
+    private SearchService searchService;
+    @Autowired
+    private LoginController loginController;
+    @Resource
+    private OrderMapper orderMapper;
+    @Value("${miniprogram.domain}")
+    private String domain;
+
+    /**
+     * 首页搜索商品
+     */
+    @ResponseBody
+    @RequestMapping("/product")
+    public CmWxJsonModel searchProduct(Integer organizeID, String searchWord, String code, Integer index,
+                                       Integer pageSize, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        if (searchWord == null || "".equals(searchWord)) { return model.error("请输入商品关键词"); }
+        CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+        String openID = ("1".equals(jsonModel.getCode())) ? (String)jsonModel.getData() : null;
+        //查询历史记录是否存在
+        CmMallProductSearchHistoryVo productSearchHistory = searchService.findAllProductRecord(organizeID, searchWord, openID);
+        if (productSearchHistory == null) {
+            //保存并删除大于10条的历史记录
+            searchService.saveProductRecord(organizeID, searchWord, openID);
+            searchService.deleteProductRecord(organizeID, openID);
+        } else {
+            searchService.updateProductRecord(organizeID, searchWord, openID);
+        }
+        index = (index != null) ? index : 0;
+        pageSize = (pageSize != null) ? pageSize : 10;
+        PageHelper.startPage(index, pageSize);
+        List<CmMallOrganizeProductsVo> list = searchService.searchProduct(organizeID, searchWord);
+        for (CmMallOrganizeProductsVo products : list) {
+            products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
+            //是否启用阶梯价格
+            if (products.getLadderPriceFlag().equals("1")) {
+                CmMallProductLadderPriceVo ladderPrice = searchService.findLadderPrice(products.getId().longValue());
+                products.setRetailPrice(ladderPrice.getBuyPrice());
+            }
+        }
+        CmMallPage<CmMallOrganizeProductsVo> productsPage = new CmMallPage<>(list);
+        return CmWxJsonModel.newInstance().success(productsPage);
+    }
+
+    /**
+     * 首页搜索历史记录
+     */
+    @ResponseBody
+    @RequestMapping("/record")
+    public CmWxJsonModel productRecord(Integer organizeID, String code, HttpServletRequest request) {
+        CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+        String openID = (String) jsonModel.getData();
+        List<CmMallProductSearchHistoryVo> historyList = searchService.findProductRecord(organizeID, openID);
+        return CmWxJsonModel.newInstance().success(historyList);
+    }
+
+    /**
+     * 首页搜索删除历史记录
+     */
+    @ResponseBody
+    @RequestMapping("/delete")
+    public CmWxJsonModel deleteProductRecord(Integer organizeID, String code, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        try {
+            CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+            String openID = (String) jsonModel.getData();
+            searchService.deleteRecord(organizeID, openID);
+        } catch (Exception e) {
+            return model.error("删除失败");
+        }
+        return model.success();
+    }
+
+    /**
+     * 订单列表搜索订单
+     */
+    @ResponseBody
+    @RequestMapping("/order")
+    public CmWxJsonModel searchOrder(Integer organizeID, String searchWord, String code, Integer index,
+                                     Integer pageSize, Long userID, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        if (searchWord == null || "".equals(searchWord)) { return model.error("请输入商品关键词"); }
+        CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+        String openID = ("1".equals(jsonModel.getCode())) ? (String)jsonModel.getData() : null;
+        //查询历史记录是否存在
+        CmMallProductSearchHistoryVo orderSearchHistory = searchService.findAllOrderRecord(organizeID, searchWord, openID);
+        if (orderSearchHistory == null) {
+            //保存并删除大于10条的历史记录
+            searchService.saveOrderRecord(organizeID, searchWord, openID);
+            searchService.deleteOrderRecord(organizeID, openID);
+        } else {
+            searchService.updateOrderRecord(organizeID, searchWord, openID);
+        }
+        index = (index != null) ? index : 0;
+        pageSize = (pageSize != null) ? pageSize : 10;
+        PageHelper.startPage(index, pageSize);
+        List<CmMallOrderVo> orderList = searchService.searchOrder(organizeID, searchWord, userID);
+        for (CmMallOrderVo order : orderList) {
+            //111,待付待收待发
+            if (order.getStatus().equals(11) && order.getPayStatus().equals("1")) {
+                order.setStatus("111");
+            }
+            String[] ShopOrderIDs = {};
+            if (order.getShopOrderIDs().contains(",")) {
+                ShopOrderIDs = order.getShopOrderIDs().split(",");
+            } else {
+                ShopOrderIDs = new String[]{order.getShopOrderIDs()};
+            }
+            List<CmMallShopOrder> shopOrderList = orderMapper.findAllShopOrder(ShopOrderIDs);
+            List<CmMallShopOrderVo> shopOrderVoList = new ArrayList<>();
+            for (CmMallShopOrder shopOrder : shopOrderList) {
+                CmMallShopOrderVo shopOrderVo = new CmMallShopOrderVo();
+                CopyUtil.copyProperties(shopOrderVo, shopOrder);
+                List<CmMallOrderProduct> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderID());
+                List<CmMallOrderProductVo> orderProductVoList = new ArrayList<>();
+                for (CmMallOrderProduct orderProduct : orderProductList) {
+                    CmMallOrderProductVo orderProductVo = new CmMallOrderProductVo();
+                    CopyUtil.copyProperties(orderProductVo, orderProduct);
+                    orderProductVo.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
+                    orderProductVoList.add(orderProductVo);
+                }
+                shopOrderVo.setCmOrderProducts(orderProductVoList);
+                shopOrderVo.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
+            }
+            order.setShopOrderList(shopOrderVoList);
+        }
+        CmMallPage<CmMallOrderVo> orderPage = new CmMallPage<>(orderList);
+        return model.success(orderPage);
+    }
+
+    /**
+     * 订单搜索历史记录
+     */
+    @ResponseBody
+    @RequestMapping("/history")
+    public CmWxJsonModel orderRecord(Integer organizeID, String code, HttpServletRequest request) {
+        CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+        String openID = (String) jsonModel.getData();
+        List<CmMallProductSearchHistoryVo> historyList = searchService.findOrderRecord(organizeID, openID);
+        return CmWxJsonModel.newInstance().success(historyList);
+    }
+
+    /**
+     * 订单搜索删除历史记录
+     */
+    @ResponseBody
+    @RequestMapping("/deleteOrderRecord")
+    public CmWxJsonModel deleteOrderRecord(Integer organizeID, String code, HttpServletRequest request) {
+        CmWxJsonModel model = CmWxJsonModel.newInstance();
+        try {
+            CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
+            String openID = (String) jsonModel.getData();
+            searchService.deleteSearchHistory(organizeID, openID);
+        } catch (Exception e) {
+            return model.error("删除失败");
+        }
+        return model.success();
+    }
+}

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;
@@ -11,6 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,22 +36,21 @@ public class LoginController {
     private LoginService loginService;
     @Value("${miniprogram.ValidTime}")
     private Integer ValidTime;
-    @Value("${miniprogram.AppId}")
-    private String AppId;
-    @Value("${miniprogram.AppSecret}")
-    private String AppSecret;
+    @Autowired
+    private Environment env;
 
-    public WxJsonModel login(String code, HttpServletRequest request) {
+    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);
         map.put("referer", referer);
         String requestUrl = "https://api.weixin.qq.com/sns/jscode2session";
         Map<String, String> requestUrlParam = new HashMap<String, String>();
-        requestUrlParam.put("appid", AppId);//小程序appId
-        requestUrlParam.put("secret", AppSecret);//小程序appsecret
+        requestUrlParam.put("appid", env.getProperty("miniprogram.AppId" + organizeID));//小程序appId
+        logger.info("" + env.getProperty("miniprogram.AppId" + organizeID));
+        requestUrlParam.put("secret", env.getProperty("miniprogram.AppSecret" + organizeID));//小程序appsecret
         requestUrlParam.put("js_code", code);//小程序端返回的code
         requestUrlParam.put("grant_type", "authorization_code");//默认参数
         //发送post请求读取调用微信接口获取openid用户唯一标识
@@ -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);
+    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);
+    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,9 +34,9 @@ public class PersonalController {
      */
     @RequestMapping("/myCentre")
     @ResponseBody
-    public WxJsonModel myCentre(CmOperationUser operationUser) {
-        WxJsonModel res = WxJsonModel.newInstance();
-        Club club = personalService.myCentre(operationUser);
+    public CmWxJsonModel myCentre(CmMallOperationUser operationUser) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
+        CmMallClub club = personalService.myCentre(operationUser);
         return res.success("1", club);
     }
 
@@ -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,12 +100,12 @@ 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);
+        List<CmMallAddress> addressList = personalService.findAddress(userID);
+        CmMallPage<CmMallAddress> page = new CmMallPage<>(addressList);
         return page;
     }
 
@@ -116,12 +116,12 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public WxJsonModel saveAddress(@RequestBody Address address, String code, HttpServletRequest request) {
-        WxJsonModel res = WxJsonModel.newInstance();
+    public CmWxJsonModel saveAddress(@RequestBody CmMallAddress address, String code, HttpServletRequest request) {
+        CmWxJsonModel res = CmWxJsonModel.newInstance();
         if (address == null) return res.error("参数异常");
         //判断是否处于登录状态
         String openid = (String) request.getSession().getAttribute("openid");
-        CmOperationUser operationUser = loginService.doLogin(openid, address.getUserOrganizeID());
+        CmMallOperationUser operationUser = loginService.doLogin(openid, address.getUserOrganizeID());
         if (operationUser == null) return res.error("账户异常");
         try {
             personalService.saveAddress(address);
@@ -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 userInvoiceInfo) {
+        if (userInvoiceInfo == null) return CmWxJsonModel.newInstance().error("参数异常");
+        CmWxJsonModel jsonModel = personalService.invoice(userInvoiceInfo);
         return jsonModel;
     }
 }

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

@@ -1,123 +0,0 @@
-package com.caimei.entity;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 发货物流批次Entity
- *
- * @author 李俊
- * @version 2019-12-17
- */
-public class CmLogisticsBatch implements Serializable {
-	
-	private static final long serialVersionUID = 1L;
-	private Integer id;
-	private Integer shopOrderID;		// 子订单ID
-	private Integer orderID;		// 主订单ID
-	private Integer outStoreTimes;		// 第几批发货
-	private String status;	//是否确认收货（0：否，1：是）
-	private String mailer;		// 邮寄者  0 采美   1 供应商
-	private Integer shopID;		// 供应商ID
-	private String updateDate;	//更新时间
-	private String deliveryTime;		// 发货时间
-	private String receiptTime;		// 收货时间
-	List<CmLogisticsRecord> cmLogisticsRecords;//该批次订单商品记录
-	List<LogisticsInfo> logisticsInfos;//该批次物流信息
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public Integer getShopOrderID() {
-		return shopOrderID;
-	}
-
-	public void setShopOrderID(Integer shopOrderID) {
-		this.shopOrderID = shopOrderID;
-	}
-	
-	public Integer getOrderID() {
-		return orderID;
-	}
-
-	public void setOrderID(Integer orderID) {
-		this.orderID = orderID;
-	}
-	
-	public Integer getOutStoreTimes() {
-		return outStoreTimes;
-	}
-
-	public void setOutStoreTimes(Integer outStoreTimes) {
-		this.outStoreTimes = outStoreTimes;
-	}
-	
-	public String getMailer() {
-		return mailer;
-	}
-
-	public void setMailer(String mailer) {
-		this.mailer = mailer;
-	}
-	
-	public Integer getShopID() {
-		return shopID;
-	}
-
-	public void setShopID(Integer shopID) {
-		this.shopID = shopID;
-	}
-	
-	public String getDeliveryTime() {
-		return deliveryTime;
-	}
-
-	public void setDeliveryTime(String deliveryTime) {
-		this.deliveryTime = deliveryTime;
-	}
-	
-	public String getReceiptTime() {
-		return receiptTime;
-	}
-
-	public void setReceiptTime(String receiptTime) {
-		this.receiptTime = receiptTime;
-	}
-
-	public List<CmLogisticsRecord> getCmLogisticsRecords() {
-		return cmLogisticsRecords;
-	}
-
-	public void setCmLogisticsRecords(List<CmLogisticsRecord> cmLogisticsRecords) {
-		this.cmLogisticsRecords = cmLogisticsRecords;
-	}
-
-	public List<LogisticsInfo> getLogisticsInfos() {
-		return logisticsInfos;
-	}
-
-	public void setLogisticsInfos(List<LogisticsInfo> logisticsInfos) {
-		this.logisticsInfos = logisticsInfos;
-	}
-
-	public String getUpdateDate() {
-		return updateDate;
-	}
-
-	public void setUpdateDate(String updateDate) {
-		this.updateDate = updateDate;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-}

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> hospitals; //医院信息
     private Integer sort;  //排序值
     private String securityLink;   //防伪链接
 
@@ -132,17 +132,17 @@ public class brand implements Serializable {
         this.delFlag = delFlag;
     }
 
-    public List<hospital> getHospitals() {
+    public List<CmMallHospital> getHospitals() {
         return hospitals;
     }
 
-    public void setHospitals(List<hospital> hospitals) {
+    public void setHospitals(List<CmMallHospital> hospitals) {
         this.hospitals = hospitals;
     }
 
     @Override
     public String toString() {
-        return "brand{" +
+        return "CmMallBrand{" +
                 "id=" + id +
                 ", name='" + name + '\'' +
                 ", logo='" + logo + '\'' +

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> towns;   //下面的区
 
     public Integer getCityid() {
         return cityid;
@@ -43,11 +43,11 @@ public class City implements Serializable {
         this.validflag = validflag;
     }
 
-    public List<Town> getTowns() {
+    public List<CmMallTown> getTowns() {
         return towns;
     }
 
-    public void setTowns(List<Town> towns) {
+    public void setTowns(List<CmMallTown> towns) {
         this.towns = towns;
     }
 }

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> brands;         //品牌
     private Integer sort;  //排序值
 
     public Integer getSort() {
@@ -204,17 +204,17 @@ public class hospital implements Serializable {
         this.creationVip = creationVip;
     }
 
-    public List<brand> getBrands() {
+    public List<CmMallBrand> getBrands() {
         return brands;
     }
 
-    public void setBrands(List<brand> brands) {
+    public void setBrands(List<CmMallBrand> brands) {
         this.brands = brands;
     }
 
     @Override
     public String toString() {
-        return "hospital{" +
+        return "CmMallHospital{" +
                 "id=" + id +
                 ", name='" + name + '\'' +
                 ", provinceCityDistrict='" + provinceCityDistrict + '\'' +

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

@@ -0,0 +1,132 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 发货物流批次Entity
+ *
+ * @author 李俊
+ * @version 2019-12-17
+ */
+public class CmMallLogisticsBatch implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Integer id;
+    private Integer shopOrderID;        // 子订单ID
+    private Integer orderID;        // 主订单ID
+    private Integer outStoreTimes;        // 第几批发货
+    private String status;    //是否确认收货（0：否，1：是）
+    private String mailer;        // 邮寄者  0 采美   1 供应商
+    private Integer shopID;        // 供应商ID
+    private String updateDate;    //更新时间
+    private String deliveryTime;        // 发货时间
+    private String receiptTime;        // 收货时间
+    private List<CmMallLogisticsRecord> cmLogisticsRecords;//该批次订单商品记录
+    private List<CmMallLogisticsInfo> logisticsInfos;//该批次物流信息
+    private List<CmMallShopOrder> shopOrderList;
+
+    public List<CmMallShopOrder> getShopOrderList() {
+        return shopOrderList;
+    }
+
+    public void setShopOrderList(List<CmMallShopOrder> shopOrderList) {
+        this.shopOrderList = shopOrderList;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getShopOrderID() {
+        return shopOrderID;
+    }
+
+    public void setShopOrderID(Integer shopOrderID) {
+        this.shopOrderID = shopOrderID;
+    }
+
+    public Integer getOrderID() {
+        return orderID;
+    }
+
+    public void setOrderID(Integer orderID) {
+        this.orderID = orderID;
+    }
+
+    public Integer getOutStoreTimes() {
+        return outStoreTimes;
+    }
+
+    public void setOutStoreTimes(Integer outStoreTimes) {
+        this.outStoreTimes = outStoreTimes;
+    }
+
+    public String getMailer() {
+        return mailer;
+    }
+
+    public void setMailer(String mailer) {
+        this.mailer = mailer;
+    }
+
+    public Integer getShopID() {
+        return shopID;
+    }
+
+    public void setShopID(Integer shopID) {
+        this.shopID = shopID;
+    }
+
+    public String getDeliveryTime() {
+        return deliveryTime;
+    }
+
+    public void setDeliveryTime(String deliveryTime) {
+        this.deliveryTime = deliveryTime;
+    }
+
+    public String getReceiptTime() {
+        return receiptTime;
+    }
+
+    public void setReceiptTime(String receiptTime) {
+        this.receiptTime = receiptTime;
+    }
+
+    public List<CmMallLogisticsRecord> getCmLogisticsRecords() {
+        return cmLogisticsRecords;
+    }
+
+    public void setCmLogisticsRecords(List<CmMallLogisticsRecord> cmLogisticsRecords) {
+        this.cmLogisticsRecords = cmLogisticsRecords;
+    }
+
+    public List<CmMallLogisticsInfo> getLogisticsInfos() {
+        return logisticsInfos;
+    }
+
+    public void setLogisticsInfos(List<CmMallLogisticsInfo> logisticsInfos) {
+        this.logisticsInfos = logisticsInfos;
+    }
+
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

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,13 +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<CmMallRouter> routers = new ArrayList<>();//此对象使用在转换info格式提供前端使用。JSONArray.parseArray(info, CmMallRouter.class)
+    private List<CmMallLogisticsRecord> logisticsRecordList;    //物流批次
 
+    public List<CmMallLogisticsRecord> getLogisticsRecordList() {
+        return 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;
     }
 
@@ -158,11 +166,11 @@ public class LogisticsInfo implements Serializable {
         this.remarks = remarks;
     }
 
-    public List<Router> getRouters() {
+    public List<CmMallRouter> getRouters() {
         return routers;
     }
 
-    public void setRouters(List<Router> routers) {
+    public void setRouters(List<CmMallRouter> routers) {
         this.routers = routers;
     }
 

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

@@ -1,6 +1,7 @@
 package com.caimei.entity;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 发货物流记录Entity
@@ -8,7 +9,7 @@ import java.io.Serializable;
  * @author 李俊
  * @version 2019-12-17
  */
-public class CmLogisticsRecord implements Serializable {
+public class CmMallLogisticsRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
     private Integer id;
@@ -22,7 +23,24 @@ public class CmLogisticsRecord implements Serializable {
     private String productName;        // 商品名称
     private String image;        // 商品图片
     private Integer organizeProductID;  //组织的商品Id，关联cm_mall_organize_products表ID[适用于组织订单]
+    private String name;        //供应商名称
+    private String logo;        //供应商logo
 
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
 
     public Integer getId() {
         return 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,15 +3,16 @@ 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
     private Integer productID;     //商品ID,具体对应product表
     private Double normalPrice;    //市场价
     private Double costPrice;       //成本价
-    private Double retailPrice;     //售价
-    private Integer minBuyNumber;    //最小起订量
+    private String ladderPriceFlag;  //启用阶梯价格标识 0否 1是
+    private Double retailPrice;     //售价(此起售价适用于非阶梯价格)
+    private Integer minBuyNumber;    //最小起订量(此起售价适用于非阶梯价格)
     private String preferredProduct;    //是否是优选商品：0不是优选,1优选商品
     private String commonlyProduct;     //是否是常用商品：0不是常用,1常用商品
     private String preferentialProduct; //是否是惊喜特惠：0不是特惠,1惊喜特惠商品
@@ -27,14 +28,16 @@ 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 product;    //采美商品表
+    private List<CmMallProductImage> productImage;  //商品图片
+    private CmMallProductDetailInfo productDetailInfo; //商品详情
+    private CmMallShop shop;      //供应商信息
     private String shopName;        //商品名称
     private Integer shopID;//
     private String productClassifyName;//商品分类名字
     private Boolean productsChecked = false;  //商品勾选状态
+    private String postageToPay;//邮费是否到付:1是，2否[是为到付，否为不到付并非包邮具体是否包邮参考邮费规则]
+    private List<CmMallProductLadderPrice> productLadderPrices;  //阶梯价格
 
     public Integer getId() {
         return id;
@@ -204,35 +207,35 @@ public class CmOrganizeProducts implements Serializable {
         this.unit = unit;
     }
 
-    public Product getProduct() {
+    public CmMallProduct getProduct() {
         return product;
     }
 
-    public void setProduct(Product product) {
+    public void setProduct(CmMallProduct product) {
         this.product = product;
     }
 
-    public List<com.caimei.entity.ProductImage> getProductImage() {
-        return ProductImage;
+    public List<CmMallProductImage> getProductImage() {
+        return productImage;
     }
 
-    public void setProductImage(List<com.caimei.entity.ProductImage> productImage) {
-        ProductImage = productImage;
+    public void setProductImage(List<CmMallProductImage> productImage) {
+        this.productImage = productImage;
     }
 
-    public ProductDetailInfo getProductDetailInfo() {
+    public CmMallProductDetailInfo getProductDetailInfo() {
         return productDetailInfo;
     }
 
-    public void setProductDetailInfo(ProductDetailInfo productDetailInfo) {
+    public void setProductDetailInfo(CmMallProductDetailInfo productDetailInfo) {
         this.productDetailInfo = productDetailInfo;
     }
 
-    public Shop getShop() {
+    public CmMallShop getShop() {
         return shop;
     }
 
-    public void setShop(Shop shop) {
+    public void setShop(CmMallShop shop) {
         this.shop = shop;
     }
 
@@ -283,4 +286,28 @@ public class CmOrganizeProducts implements Serializable {
     public void setShopID(Integer shopID) {
         this.shopID = shopID;
     }
+
+    public String getPostageToPay() {
+        return postageToPay;
+    }
+
+    public void setPostageToPay(String postageToPay) {
+        this.postageToPay = postageToPay;
+    }
+
+    public String getLadderPriceFlag() {
+        return ladderPriceFlag;
+    }
+
+    public void setLadderPriceFlag(String ladderPriceFlag) {
+        this.ladderPriceFlag = ladderPriceFlag;
+    }
+
+    public List<CmMallProductLadderPrice> getProductLadderPrices() {
+        return productLadderPrices;
+    }
+
+    public void setProductLadderPrices(List<CmMallProductLadderPrice> productLadderPrices) {
+        this.productLadderPrices = productLadderPrices;
+    }
 }

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/CmMallPageModules.java

@@ -0,0 +1,97 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CmMallPageModules implements Serializable {
+    private Integer id;
+    private Integer organizeID;//组织ID
+    private String organizeName;//组织名称
+    private String firstModulesName;//模块一名称
+    private String secondModulesName;//模块二名称
+    private String thirdModulesName;//模块三名称
+    private String firstModulesImage;//模块一图片
+    private String secondModulesImage;//模块二图片
+    private Date addTime;//添加时间
+    private Date updateTime;//修改时间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrganizeID() {
+        return organizeID;
+    }
+
+    public void setOrganizeID(Integer organizeID) {
+        this.organizeID = organizeID;
+    }
+
+    public String getOrganizeName() {
+        return organizeName;
+    }
+
+    public void setOrganizeName(String organizeName) {
+        this.organizeName = organizeName;
+    }
+
+    public String getFirstModulesName() {
+        return firstModulesName;
+    }
+
+    public void setFirstModulesName(String firstModulesName) {
+        this.firstModulesName = firstModulesName;
+    }
+
+    public String getSecondModulesName() {
+        return secondModulesName;
+    }
+
+    public void setSecondModulesName(String secondModulesName) {
+        this.secondModulesName = secondModulesName;
+    }
+
+    public String getThirdModulesName() {
+        return thirdModulesName;
+    }
+
+    public void setThirdModulesName(String thirdModulesName) {
+        this.thirdModulesName = thirdModulesName;
+    }
+
+    public String getFirstModulesImage() {
+        return firstModulesImage;
+    }
+
+    public void setFirstModulesImage(String firstModulesImage) {
+        this.firstModulesImage = firstModulesImage;
+    }
+
+    public String getSecondModulesImage() {
+        return secondModulesImage;
+    }
+
+    public void setSecondModulesImage(String secondModulesImage) {
+        this.secondModulesImage = secondModulesImage;
+    }
+
+    public Date getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(Date addTime) {
+        this.addTime = addTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+}

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/CmMallProductLadderPrice.java

@@ -0,0 +1,97 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CmMallProductLadderPrice implements Serializable {
+    private Integer id;
+    private Integer productId;      //商品id,具体对应cm_mall_organize_products表的ID
+    private Integer ladderNum;      //第几阶梯(最多可设置3阶梯)
+    private Integer buyNum;         //购买数量（起订量）
+    private Double buyPrice;        //购买价格（对应起订量单价）
+    private Integer createBy;       //创建人(cm_mall_admin_user表ID)
+    private Integer updateBy;        //最后更新人(cm_mall_admin_user表ID)
+    private Date updateDate;        //创建时间
+    private String delFlag;         //删除标记 0 否，其余是
+    private String buyNumRangeShow;     //购买数量区间
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public Integer getLadderNum() {
+        return ladderNum;
+    }
+
+    public void setLadderNum(Integer ladderNum) {
+        this.ladderNum = ladderNum;
+    }
+
+    public Integer getBuyNum() {
+        return buyNum;
+    }
+
+    public void setBuyNum(Integer buyNum) {
+        this.buyNum = buyNum;
+    }
+
+    public Double getBuyPrice() {
+        return buyPrice;
+    }
+
+    public void setBuyPrice(Double buyPrice) {
+        this.buyPrice = buyPrice;
+    }
+
+    public Integer getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(Integer createBy) {
+        this.createBy = createBy;
+    }
+
+    public Integer getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(Integer updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getBuyNumRangeShow() {
+        return buyNumRangeShow;
+    }
+
+    public void setBuyNumRangeShow(String buyNumRangeShow) {
+        this.buyNumRangeShow = buyNumRangeShow;
+    }
+}

src/main/java/com/caimei/entity/CmMallProductSearchHistory.java

@@ -0,0 +1,61 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CmMallProductSearchHistory implements Serializable {
+    private Integer id;
+    private Integer organizeID; //组织ID,具体对应cm_mall_organize表ID
+    private String openID;      //小程序商城openid
+    private String searchWord;  //搜索关键词
+    private Date searchDate;    //搜索时间
+    private String delFlag;     //删除标记 0 否，其余是
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getOrganizeID() {
+        return organizeID;
+    }
+
+    public void setOrganizeID(Integer organizeID) {
+        this.organizeID = organizeID;
+    }
+
+    public String getOpenID() {
+        return openID;
+    }
+
+    public void setOpenID(String openID) {
+        this.openID = openID;
+    }
+
+    public String getSearchWord() {
+        return searchWord;
+    }
+
+    public void setSearchWord(String searchWord) {
+        this.searchWord = searchWord;
+    }
+
+    public Date getSearchDate() {
+        return searchDate;
+    }
+
+    public void setSearchDate(Date searchDate) {
+        this.searchDate = searchDate;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+}

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

@@ -2,12 +2,13 @@ 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;  //分类名称
     private String classifyImage;  //分类图标
     private Integer sort;    // 排序
+    private String postageToPay;    //邮费是否到付:1是，2否
     private String status;   //分类使用状态：1启用,2停用
     private String addTime;   //添加时间
     private String updateTime;  //更新时间
@@ -84,4 +85,12 @@ public class CmProductsClassify implements Serializable {
     public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
+
+    public String getPostageToPay() {
+        return postageToPay;
+    }
+
+    public void setPostageToPay(String postageToPay) {
+        this.postageToPay = postageToPay;
+    }
 }

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> citys;    //下面的市
 
     public Long getProvinceid() {
         return provinceid;
@@ -52,11 +52,11 @@ public class Province implements Serializable {
         this.freemintotalprice = freemintotalprice;
     }
 
-    public List<City> getCitys() {
+    public List<CmMallCity> getCitys() {
         return citys;
     }
 
-    public void setCitys(List<City> citys) {
+    public void setCitys(List<CmMallCity> citys) {
         this.citys = citys;
     }
 }

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> cmOrderProducts; //订单商品信息
+    private CmMallUserInvoiceInfo orderInvoice;//订单发票信息
+    private List<CmMallLogisticsInfo> logisticsInfos;//订单快递信息
+    private List<CmMallLogisticsBatch> cmLogisticsBatches;//物流批次信息
+    private List<CmMallLogisticsRecord> cmLogisticsRecords; //发货物流记录
     private String payStatus;   //(付款供应商)付款状态：1待付款、2部分付款、3已付款'
     private String sendOutStatus;   //发货状态：1待发货、2部分发货、3已发货
     private Double shopProductAmount; //商品费
@@ -427,37 +427,16 @@ public class CmShopOrder implements Serializable {
         this.shopName = shopName;
     }
 
-    public List<CmOrderProduct> getCmOrderProducts() {
-        return cmOrderProducts;
-    }
 
-    public void setCmOrderProducts(List<CmOrderProduct> cmOrderProducts) {
-        this.cmOrderProducts = cmOrderProducts;
-    }
 
-    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 void setLogisticsInfos(List<LogisticsInfo> logisticsInfos) {
-        this.logisticsInfos = logisticsInfos;
-    }
-
-    public List<CmLogisticsBatch> getCmLogisticsBatches() {
-        return cmLogisticsBatches;
-    }
-
-    public void setCmLogisticsBatches(List<CmLogisticsBatch> cmLogisticsBatches) {
-        this.cmLogisticsBatches = cmLogisticsBatches;
-    }
 
     public String getPayStatus() {
         return payStatus;
@@ -523,11 +502,35 @@ public class CmShopOrder implements Serializable {
         this.shopOtherFee = shopOtherFee;
     }
 
-    public List<CmLogisticsRecord> getCmLogisticsRecords() {
+    public List<CmMallOrderProduct> getCmOrderProducts() {
+        return cmOrderProducts;
+    }
+
+    public void setCmOrderProducts(List<CmMallOrderProduct> cmOrderProducts) {
+        this.cmOrderProducts = cmOrderProducts;
+    }
+
+    public List<CmMallLogisticsInfo> getLogisticsInfos() {
+        return logisticsInfos;
+    }
+
+    public void setLogisticsInfos(List<CmMallLogisticsInfo> logisticsInfos) {
+        this.logisticsInfos = logisticsInfos;
+    }
+
+    public List<CmMallLogisticsBatch> getCmLogisticsBatches() {
+        return cmLogisticsBatches;
+    }
+
+    public void setCmLogisticsBatches(List<CmMallLogisticsBatch> cmLogisticsBatches) {
+        this.cmLogisticsBatches = cmLogisticsBatches;
+    }
+
+    public List<CmMallLogisticsRecord> getCmLogisticsRecords() {
         return cmLogisticsRecords;
     }
 
-    public void setCmLogisticsRecords(List<CmLogisticsRecord> cmLogisticsRecords) {
+    public void setCmLogisticsRecords(List<CmMallLogisticsRecord> cmLogisticsRecords) {
         this.cmLogisticsRecords = cmLogisticsRecords;
     }
 

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;
 
@@ -10,14 +10,14 @@ import org.apache.ibatis.annotations.Param;
  * @author Lijun
  * @create 2019-12-20
  **/
-@Mapper
+// @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 → src/main/java/com/caimei/mapper/order/CmMallShopOrderMapper.java

@@ -1,38 +1,38 @@
 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;
 
 import java.util.List;
 import java.util.Map;
 
-@Mapper
-public interface CmShopOrderMapper {
+// @Mapper
+public interface CmMallShopOrderMapper {
 
-    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

@@ -1,64 +1,66 @@
 package com.caimei.mapper.order;
 
 import com.caimei.entity.*;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallShop;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
 
-@Mapper
+// @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(@Param("orderID") Integer orderID, @Param("shopOrderID") Integer shopOrderID);
+    List<CmMallLogisticsInfo> findLogisticsInfo(Integer logisticsBatchID);
 
-    List<CmLogisticsRecord> findLogisticsRecord(Integer shopOrderID);
+    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,10 +69,18 @@ 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<CmMallLogisticsBatch> findLogistics(Integer orderID);
+
+    CmMallProductsClassify findClassifyID(String classifyID);
+
+    CmMallProductLadderPrice findLadderPrice(Integer id);
 }

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

@@ -1,47 +1,47 @@
 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;
 
 import java.util.List;
 
 
-@Mapper
+// @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

@@ -5,21 +5,23 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-@Mapper
+// @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);
 
     CmMallCart findCartProduct(CmMallCart cmMallCart);
 
     void updateCart(CmMallCart cart);
+
+    List<CmMallProductLadderPrice> findLadderPrice(Integer id);
 }

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

@@ -1,26 +1,31 @@
 package com.caimei.mapper.products;
 
 import com.caimei.entity.*;
+import com.caimei.entity.CmMallOrganizeProducts;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-@Mapper
+// @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);
+
+    CmMallPageModules findModules(Integer organizeID);
+
+    List<String> findBannerImage(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
+// @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,19 +1,19 @@
 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;
 
 import java.util.List;
 
-@Mapper
+// @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 → src/main/java/com/caimei/mapper/user/CmMallAddressMapper.java

@@ -1,19 +1,19 @@
 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;
 
 import java.util.List;
 
-@Mapper
-public interface AddressMapper {
+// @Mapper
+public interface CmMallAddressMapper {
 
-    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/CmMallUserMapper.java

@@ -0,0 +1,43 @@
+package com.caimei.mapper.user;
+
+import com.caimei.entity.CmMallUserBalanceRecord;
+import com.caimei.entity.CmMallUser;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+// @Mapper
+public interface CmMallUserMapper {
+
+	/**
+	 * 通过用户Id获取用户信息
+	 * @param userId
+	 * @return
+	 */
+	CmMallUser findUserById(@Param("userId") Integer userId);
+
+	/**
+	 * 更新用户可用余额
+	 * @param cmMallUser
+	 */
+    void updateAbleUserMoney(CmMallUser cmMallUser);
+
+	/**
+	 * 更新用户余额
+	 * @param cmMallUser
+	 */
+	void updateUserMoney(CmMallUser cmMallUser);
+
+	/**
+	 * 插入用户余额使用记录
+	 * @param cmMallUserBalanceRecord
+	 * @return
+	 */
+	int insertUserBalanceRecord(CmMallUserBalanceRecord cmMallUserBalanceRecord);
+
+	/**
+	 * 更新用户余额记录
+	 * @param cmMallUserBalanceRecord
+	 * @return
+	 */
+	int updateBalanceRecord(CmMallUserBalanceRecord cmMallUserBalanceRecord);
+}

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
+// @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

@@ -6,38 +6,38 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
+// @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,43 +0,0 @@
-package com.caimei.mapper.user;
-
-import com.caimei.entity.CmUserBalanceRecord;
-import com.caimei.entity.User;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface UserMapper {
-
-	/**
-	 * 通过用户Id获取用户信息
-	 * @param userId
-	 * @return
-	 */
-	User findUserById(@Param("userId") Integer userId);
-
-	/**
-	 * 更新用户可用余额
-	 * @param user
-	 */
-    void updateAbleUserMoney(User user);
-
-	/**
-	 * 更新用户余额
-	 * @param user
-	 */
-	void updateUserMoney(User user);
-
-	/**
-	 * 插入用户余额使用记录
-	 * @param cmUserBalanceRecord
-	 * @return
-	 */
-	int insertUserBalanceRecord(CmUserBalanceRecord cmUserBalanceRecord);
-
-	/**
-	 * 更新用户余额记录
-	 * @param cmUserBalanceRecord
-	 * @return
-	 */
-	int updateBalanceRecord(CmUserBalanceRecord cmUserBalanceRecord);
-}

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

@@ -1,8 +1,6 @@
 package com.caimei.service.order;
 
-import com.caimei.entity.CmOrder;
-import com.caimei.entity.CmShopOrder;
-import com.caimei.entity.WxJsonModel;
+import com.caimei.entity.*;
 
 import java.util.List;
 import java.util.Map;
@@ -14,17 +12,17 @@ public interface OrderService {
 
     Map<String, Object> particulars(Integer orderID) throws Exception;
 
-    List<CmShopOrder> logistics(Integer orderID);
+    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/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,33 +44,64 @@ 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.setProduct(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.setProductImage(cmMallProductImage);
         //商品详情
-        ProductDetailInfo productDetailInfo = detailsMapper.findProductDetail(organizeProducts.getProductID());
-        organizeProducts.setProductDetailInfo(productDetailInfo);
+        CmMallProductDetailInfo cmMallProductDetailInfo = detailsMapper.findProductDetail(organizeProducts.getProductID());
+        organizeProducts.setProductDetailInfo(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.setShop(cmMallShop);
         //购物车数量
         Integer count = homePageMapper.cartQuantity(userID);
         if (count == null) count = 0;
         organizeProducts.setCartCount(count);
+        //启用阶梯价格
+        if (organizeProducts.getLadderPriceFlag().equals("1")) {
+            List<CmMallProductLadderPrice> ladderPriceList = detailsMapper.findLadderPrice(id);
+            //已根据购买期数排序，期数越大价格越低
+            Integer buyNum1 = 0;//第一阶梯（价格最高）
+            Integer buyNum2 = 0;//第二阶梯
+            Integer buyNum3 = 0;//第三阶梯（价格最低）
+            if (ladderPriceList.size() == 3) {
+                CmMallProductLadderPrice ladderPrice0 = ladderPriceList.get(0);//第一阶梯
+                CmMallProductLadderPrice ladderPrice1 = ladderPriceList.get(1);//第二阶梯
+                CmMallProductLadderPrice ladderPrice2 = ladderPriceList.get(2);//第三阶梯
+                if (null != ladderPrice0) buyNum1 = ladderPrice0.getBuyNum();
+                if (null != ladderPrice1) buyNum2 = ladderPrice1.getBuyNum();
+                if (null != ladderPrice2) buyNum3 = ladderPrice2.getBuyNum();
+                //增加阶梯价格区间属性设置
+                ladderPrice0.setBuyNumRangeShow(buyNum1 + "~" + (buyNum2 - 1));
+                ladderPrice1.setBuyNumRangeShow(buyNum2 + "~" + (buyNum3 - 1));
+                ladderPrice2.setBuyNumRangeShow("≥" + buyNum3);
+            } else if (ladderPriceList.size() == 2) {
+                CmMallProductLadderPrice ladderPrice0 = ladderPriceList.get(0);//第一阶梯
+                CmMallProductLadderPrice ladderPrice1 = ladderPriceList.get(1);//第二阶梯
+                if (null != ladderPrice0) buyNum1 = ladderPrice0.getBuyNum();
+                if (null != ladderPrice1) buyNum2 = ladderPrice1.getBuyNum();
+                //增加阶梯价格区间属性设置
+                ladderPrice0.setBuyNumRangeShow(buyNum1 + "~" + (buyNum2 - 1));
+                ladderPrice1.setBuyNumRangeShow("≥" + buyNum2);
+            }
+            organizeProducts.setRetailPrice(ladderPriceList.get(0).getBuyPrice());
+            organizeProducts.setMinBuyNumber(ladderPriceList.get(0).getBuyNum());
+            organizeProducts.setProductLadderPrices(ladderPriceList);
+        }
         return organizeProducts;
     }
 

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

@@ -2,6 +2,9 @@ package com.caimei.service.products.impl;
 
 import com.caimei.entity.*;
 import com.caimei.mapper.products.HomePageMapper;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.module.entity.vo.CmMallProductLadderPriceVo;
+import com.caimei.module.service.SearchService;
 import com.caimei.service.products.HomePageService;
 import com.caimei.utils.AppUtils;
 import org.slf4j.Logger;
@@ -19,6 +22,8 @@ public class HomePageServiceImpl implements HomePageService {
     protected static final Logger logger = LoggerFactory.getLogger(HomePageServiceImpl.class);
     @Autowired
     private HomePageMapper homePageMapper;
+    @Autowired
+    private SearchService searchService;
     @Value("${miniprogram.domain}")
     private String domain;
 
@@ -27,46 +32,67 @@ 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));
+            //是否启用阶梯价格
+            if (product.getLadderPriceFlag().equals("1")) {
+                CmMallProductLadderPriceVo ladderPrice = searchService.findLadderPrice(product.getId().longValue());
+                product.setRetailPrice(ladderPrice.getBuyPrice().doubleValue());
+            }
         }
         //购物车数量
         Integer count = homePageMapper.cartQuantity(userID);
         if (count == null) count = 0;
         logger.info("------------HomePageServiceImpl.information.count:" + count);
+        //模块数据
+        CmMallPageModules mallPageModules = homePageMapper.findModules(organizeID);
+        //banner图
+        List<String> bannerImageList = homePageMapper.findBannerImage(organizeID);
         map.put("productsClassify", productsClassify);
         map.put("organizeProducts", organizeProducts);
         map.put("count", count);
+        map.put("mallPageModules", mallPageModules);
+        map.put("bannerImageList", bannerImageList);
         return map;
     }
 
     @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));
+            //是否启用阶梯价格
+            if (products.getLadderPriceFlag().equals("1")) {
+                CmMallProductLadderPriceVo ladderPrice = searchService.findLadderPrice(products.getId().longValue());
+                products.setRetailPrice(ladderPrice.getBuyPrice().doubleValue());
+            }
         }
         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));
+            //是否启用阶梯价格
+            if (products.getLadderPriceFlag().equals("1")) {
+                CmMallProductLadderPriceVo ladderPrice = searchService.findLadderPrice(products.getId().longValue());
+                products.setRetailPrice(ladderPrice.getBuyPrice().doubleValue());
+            }
         }
         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.setBrands(CmMallBrands);
         }
         return member;
     }

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

@@ -1,9 +1,7 @@
 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.*;
+import com.caimei.mapper.products.DetailsMapper;
 import com.caimei.mapper.products.HomePageMapper;
 import com.caimei.mapper.products.ShoppingMapper;
 import com.caimei.service.products.ShoppingService;
@@ -26,6 +24,8 @@ public class ShoppingServiceImpl implements ShoppingService {
     private ShoppingMapper shoppingMapper;
     @Autowired
     private HomePageMapper homePageMapper;
+    @Autowired
+    private DetailsMapper detailsMapper;
     @Value("${miniprogram.domain}")
     private String domain;
 
@@ -33,25 +33,36 @@ 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")) {
+                        if (products.getLadderPriceFlag().equals("1")) {
+                            //启用阶梯价格
+                            List<CmMallProductLadderPrice> ladderPriceList = detailsMapper.findLadderPrice(products.getId());
+                            for (CmMallProductLadderPrice ladderPrice : ladderPriceList) {
+                                if (products.getProductCount() >= ladderPrice.getBuyNum()) {
+                                    products.setRetailPrice(ladderPrice.getBuyPrice());
+                                }
+                            }
+                            products.setProductLadderPrices(ladderPriceList);
+                            products.setMinBuyNumber(ladderPriceList.get(0).getBuyNum());
+                        }
                         totalPrice += (products.getRetailPrice() * products.getProductCount());
                     }
                 }
-                shop.setTotalPrice(totalPrice);
+                cmMallShop.setTotalPrice(totalPrice);
             }
         }
-        Page<Shop> page = new Page<>(shopList);
+        CmMallPage<CmMallShop> page = new CmMallPage<>(cmMallShopList);
         Integer cartQuantity = homePageMapper.cartQuantity(userID);
         if (cartQuantity == null) cartQuantity = 0;
-        logger.info("------------ShoppingServiceImpl.findAllCart.cartQuantity:"+cartQuantity);
+        logger.info("------------ShoppingServiceImpl.findAllCart.cartQuantity:" + cartQuantity);
         map.put("page", page);
         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,8 +72,8 @@ 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> page = new CmMallPage<>(list);
         Double ableUserMoney = personalMapper.ableUserMoney(balanceRecord.getUserId());
         if (ableUserMoney == null) ableUserMoney = 0d;
         String userMoney = String.format("%.2f", ableUserMoney);
@@ -84,15 +84,15 @@ public class PersonalServiceImpl implements PersonalService {
     }
 
     @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.setCitys(cmMallCityList);
+            if (cmMallCityList != null && cmMallCityList.size() > 0) {
+                for (CmMallCity cmMallCity : cmMallCityList) {
+                    List<CmMallTown> cmMallTownList = personalMapper.findAllTown(cmMallCity.getCityid());
+                    cmMallCity.setTowns(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/CopyUtil.java

@@ -0,0 +1,97 @@
+package com.caimei.utils;
+
+import java.beans.PropertyDescriptor;
+import java.util.Collection;
+import org.apache.commons.beanutils.PropertyUtils;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2020/2/28
+ */
+public class CopyUtil {
+    /**
+     * Copy properties of orig to dest Exception the Entity and Collection Type
+     *
+     * @param dest
+     * @param orig
+     * @return the dest bean
+     */
+    public static Object copyProperties(Object dest, Object orig) {
+        if (dest == null || orig == null) {
+            return dest;
+        }
+
+        PropertyDescriptor[] destDesc = PropertyUtils.getPropertyDescriptors(dest);
+        try {
+            for (int i = 0; i < destDesc.length; i++) {
+                Class destType = destDesc[i].getPropertyType();
+                Class origType = PropertyUtils.getPropertyType(orig, destDesc[i].getName());
+                if (destType != null && destType.equals(origType) && !destType.equals(Class.class)) {
+                    if (!Collection.class.isAssignableFrom(origType)) {
+                        try {
+                            Object value = PropertyUtils.getProperty(orig, destDesc[i].getName());
+                            PropertyUtils.setProperty(dest, destDesc[i].getName(), value);
+                        } catch (Exception ex) {}
+                    }
+                }
+            }
+
+            return dest;
+        } catch (Exception ex) {
+            // throw new CopyException(ex);
+            return dest;
+        }
+    }
+
+    /**   */
+    /**
+     * Copy properties of orig to dest Exception the Entity and Collection Type
+     *
+     * @param dest
+     * @param orig
+     * @param ignores
+     * @return the dest bean
+     */
+    public static Object copyProperties(Object dest, Object orig, String[] ignores) {
+        if (dest == null || orig == null) {
+            return dest;
+        }
+
+        PropertyDescriptor[] destDesc = PropertyUtils.getPropertyDescriptors(dest);
+        try {
+            for (int i = 0; i < destDesc.length; i++) {
+                if (contains(ignores, destDesc[i].getName())) {
+                    continue;
+                }
+
+                Class destType = destDesc[i].getPropertyType();
+                Class origType = PropertyUtils.getPropertyType(orig, destDesc[i].getName());
+                if (destType != null && destType.equals(origType) && !destType.equals(Class.class)) {
+                    if (!Collection.class.isAssignableFrom(origType)) {
+                        Object value = PropertyUtils.getProperty(orig, destDesc[i].getName());
+                        PropertyUtils.setProperty(dest, destDesc[i].getName(), value);
+                    }
+                }
+            }
+
+            return dest;
+        } catch (Exception ex) {
+            // throw new CopyException(ex);
+            return dest;
+        }
+    }
+
+    static boolean contains(String[] ignores, String name) {
+        boolean ignored = false;
+        for (int j = 0; ignores != null && j < ignores.length; j++) {
+            if (ignores[j].equals(name)) {
+                ignored = true;
+                break;
+            }
+        }
+
+        return ignored;
+    }
+}

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/dev/application-dev.yml

@@ -6,10 +6,9 @@ spring:
 
     #数据源连接--start
   datasource:
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.1.11:3306/caimei@20180509?characterEncoding=UTF8
-    username: developer
-    password: 05bZ/OxTB:X+yd%1
+    url: jdbc:mysql://119.29.0.46:3306/caimei_dev?characterEncoding=UTF8
+    username: general
+    password: 6#xsI%b4o@5c3RoE
     #数据源连接--end
 
   #模板引擎配置
@@ -24,7 +23,9 @@ spring:
 #整合mybatis
 mybatis:
   #加载Mybatis映射文件
-  mapper-locations: classpath:mapper/*Mapper.xml
+  mapper-locations:
+    - classpath:mapper/*.xml
+    - classpath:caimei-search-mapper/*Mapper.xml
   #pojo别名扫描包
   type-aliases-package: com.caimei.entity
 
@@ -37,12 +38,18 @@ pagehelper:
 
 #日志配置
 logging:
-  file: E:/caimei-mall/catalina.out
-  level: debug
+  path: E:/caimei-mall/catalina.out
+  level:
+    root: info
 
 miniprogram:
-  AppId: wx5a5cda32926f55ac
-  AppSecret: 1c371e72aba710949dd74bb184a3a774
   #邀请码有效时长  /天
   ValidTime: 7
   domain: https://www.caimei365.com
+  #组织appid1....2....3,星范组织
+  AppId1: wx5a5cda32926f55ac
+  AppSecret1: 1c371e72aba710949dd74bb184a3a774
+  #采美组织
+  AppId2: wxf3cd4ae0cdd11c36
+  AppSecret2: 9bdb37d28c5e74ad3694c09c205e9bd2
+

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,
@@ -22,7 +22,7 @@
         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},
@@ -40,7 +40,7 @@
         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,

src/main/resources/mapper/AddressMapper.xml → src/main/resources/mapper/CmMallAddressMapper.xml

@@ -1,6 +1,6 @@
 <?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.user.CmMallAddressMapper">
    
    <sql id="aColumns">
    		a.addressID,
@@ -26,7 +26,7 @@
 	 </sql>
 
 
-	<select id="findByAddressID" resultType="com.caimei.entity.Address">
+	<select id="findByAddressID" resultType="com.caimei.entity.CmMallAddress">
 		SELECT
 		<include refid="aColumns"/>
 		FROM address a
@@ -35,7 +35,7 @@
 	</select>
 
 
-	<select id="get" resultType="com.caimei.entity.Address">
+	<select id="get" resultType="com.caimei.entity.CmMallAddress">
 		SELECT 
 			 <include refid="aColumns"/>
 		FROM address a
@@ -43,7 +43,7 @@
 		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
@@ -51,7 +51,7 @@
 		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
@@ -75,8 +75,8 @@
   		DELETE FROM address WHERE addressID=#{addressID}
   	</delete>
   	
-  	<update id="update" parameterType="com.caimei.entity.Address">
-  		UPDATE address SET 
+  	<update id="update" parameterType="com.caimei.entity.CmMallAddress">
+  		UPDATE address SET
   			shouHuoRen=#{shouHuoRen},
   			mobile=#{mobile},
   			postalCode=#{postalCode},
@@ -86,7 +86,7 @@
   		WHERE addressID = #{addressID}
   	</update>
   	
-  	<insert id="insert" parameterType="com.caimei.entity.Address" keyProperty="addressID" useGeneratedKeys="true">
+  	<insert id="insert" parameterType="com.caimei.entity.CmMallAddress" keyProperty="addressID" useGeneratedKeys="true">
   		INSERT INTO address(
   				userID,
   				shouHuoRen,

src/main/resources/mapper/CmShopOrderMapper.xml → src/main/resources/mapper/CmMallShopOrderMapper.xml

@@ -1,6 +1,6 @@
 <?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.order.CmShopOrderMapper">
+<mapper namespace="com.caimei.mapper.order.CmMallShopOrderMapper">
     
 	<sql id="cmShopOrderColumns">
 		a.shopOrderID AS "shopOrderID",
@@ -65,7 +65,7 @@
 	<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/UserMapper.xml → src/main/resources/mapper/CmMallUserMapper.xml

@@ -1,8 +1,8 @@
 <?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.user.CmMallUserMapper" >
 
-	<select id="findUserById" resultType="com.caimei.entity.User">
+	<select id="findUserById" resultType="com.caimei.entity.CmMallUser">
 		SELECT * FROM user WHERE userID = #{userId}
 	</select>
 
@@ -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 id="updateAbleUserMoney" parameterType="com.caimei.entity.CmMallUser">
 		UPDATE user SET ableUserMoney=#{ableUserMoney} WHERE userID=#{userID}
 	</update>
 
-	<update id="updateUserMoney" parameterType="com.caimei.entity.User">
+	<update id="updateUserMoney" parameterType="com.caimei.entity.CmMallUser">
 		UPDATE user SET userMoney=#{userMoney} WHERE userID=#{userID}
 	</update>
 </mapper>

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,7 +13,7 @@
           AND delFlag = '0'
     </select>
 
-    <select id="product" resultType="com.caimei.entity.Product" parameterType="int">
+    <select id="product" resultType="com.caimei.entity.CmMallProduct" parameterType="int">
         SELECT
           p.*,
           cb.name AS brandName
@@ -24,7 +24,7 @@
           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,7 +44,7 @@
           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
@@ -84,4 +84,15 @@
           id = #{id}
     </update>
 
+    <select id="findLadderPrice" resultType="com.caimei.entity.CmMallProductLadderPrice">
+        SELECT
+          *
+        FROM
+          cm_mall_product_ladder_price
+        WHERE
+          productId = #{id}
+          AND delFlag = '0'
+        ORDER BY
+          ladderNum ASC
+    </select>
 </mapper>

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,13 +19,14 @@
           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,
           cop.retailPrice,
           cop.id,
-          cop.organizeID
+          cop.organizeID,
+          cop.ladderPriceFlag
         FROM
           cm_mall_organize_products cop
           LEFT JOIN product p ON cop.productID = p.productID
@@ -61,8 +62,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,
@@ -82,7 +83,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,
@@ -120,7 +121,7 @@
         </if>
     </select>
 
-    <select id="member" resultType="com.caimei.entity.hospital">
+    <select id="member" resultType="com.caimei.entity.CmMallHospital">
         SELECT
           zh.*
         FROM
@@ -135,7 +136,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
@@ -157,4 +158,26 @@
           id = #{organizeID}
           AND delFlag = '0'
     </select>
+
+    <select id="findModules" resultType="com.caimei.entity.CmMallPageModules">
+        SELECT
+          *
+        FROM
+          cm_mall_page_modules
+        WHERE
+          organizeID = #{organizeID}
+    </select>
+    
+    <select id="findBannerImage" resultType="string">
+        SELECT
+          bannerImage
+        FROM
+          cm_mall_banner_image
+        WHERE
+          enabledStatus = '1'
+          AND organizeID = #{organizeID}
+        ORDER BY
+          IF(ISNULL(sort),1,0) ASC,
+          sort ASC
+    </select>
 </mapper>

src/main/resources/mapper/LoginMapper.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.user.LoginMapper">
-    <select id="doLogin" resultType="com.caimei.entity.CmOperationUser">
+    <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,7 +198,7 @@
           )
     </insert>
 
-    <select id="findShop" resultType="com.caimei.entity.Shop">
+    <select id="findShop" resultType="com.caimei.entity.CmMallShop">
         SELECT
            s.*
         FROM
@@ -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,
@@ -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,
@@ -255,7 +255,7 @@
           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,7 +274,7 @@
           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,
@@ -290,7 +290,7 @@
           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
@@ -301,7 +301,7 @@
           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,24 +329,19 @@
           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
+        li.*,
+        clb.deliveryTime
         FROM
-          logistics_information li
-          LEFT JOIN cm_logistics_batch clb ON clb.id = li.logisticsBatchID
-          LEFT JOIN cm_logistics_record clr ON clr.logisticsBatchID=clb.id
+        logistics_information li
+        LEFT JOIN cm_logistics_batch clb ON clb.id = li.logisticsBatchID
+        LEFT JOIN cm_logistics_record clr ON clr.logisticsBatchID=clb.id
         WHERE
-        <if test="shopOrderID != null and shopOrderID != ''"  >
-            clr.shopOrderID = #{shopOrderID}
-        </if>
-        <if test="orderID != null and orderID != ''"  >
-            clr.orderID = #{orderID}
-        </if>
+          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
@@ -355,6 +350,7 @@
           LEFT JOIN cm_order_product cop ON clr.orderProductID = cop.orderProductID
         WHERE
           clr.shopOrderID = #{shopOrderID}
+          and clr.logisticsBatchID = #{logisticsBatchID}
     </select>
 
     <select id="findShareCodeRecord" resultType="com.caimei.entity.CmMallShareCodeRecord">
@@ -382,7 +378,7 @@
           )
     </insert>
 
-    <select id="findAllOrder" resultType="com.caimei.entity.CmOrder">
+    <select id="findAllOrder" resultType="com.caimei.entity.CmMallOrder">
         SELECT
           *
         FROM
@@ -418,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,
@@ -458,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
@@ -498,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
@@ -506,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,
@@ -541,4 +537,41 @@
           orderID = #{orderID}
     </delete>
 
+    <select id="findShopOrderID" parameterType="int" resultType="string">
+        SELECT
+          shopOrderID
+        FROM
+          cm_logistics_record
+        WHERE
+          orderID = #{orderID}
+          and logisticsBatchID = #{id}
+    </select>
+
+    <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.CmMallProductsClassify">
+        SELECT
+          *
+        FROM
+          cm_mall_products_classify
+        WHERE
+          id = #{classifyID}
+          AND delFlag = '0'
+    </select>
+
+    <select id="findLadderPrice" resultType="com.caimei.entity.CmMallProductLadderPrice">
+        SELECT
+          *
+        FROM
+          cm_mall_product_ladder_price
+        WHERE
+          productId = #{id}
+          AND delFlag = '0'
+        ORDER BY
+          ladderNum ASC
+        LIMIT
+          1
+    </select>
 </mapper>

src/main/resources/mapper/OrderProductMapper.xml

@@ -63,7 +63,7 @@
 		<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,
@@ -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

@@ -9,6 +9,7 @@
 		a.productID AS "productID",
 		a.normalPrice AS "normalPrice",
 		a.costPrice AS "costPrice",
+		a.ladderPriceFlag AS "ladderPriceFlag",
 		a.retailPrice AS "retailPrice",
 		a.minBuyNumber AS "minBuyNumber",
 		a.preferredProduct AS "preferredProduct",
@@ -25,7 +26,8 @@
 		p.name AS "name",
 		s.name AS "shopName",
 		s.shopID AS "shopID",
-		cmpc.classifyName AS "productClassifyName"
+		cmpc.classifyName AS "productClassifyName",
+		cmpc.postageToPay AS "postageToPay"
 	</sql>
 	
 	<sql id="cmMallOrganizeProductsJoins">
@@ -34,7 +36,7 @@
 		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
@@ -43,14 +45,14 @@
 	</select>
 
     <!--获取采美商品信息-->
-    <select id="selectCmProductById" resultType="com.caimei.entity.Product">
+    <select id="selectCmProductById" resultType="com.caimei.entity.CmMallProduct">
         SELECT
         a.*
         FROM product 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,

src/main/resources/mapper/PersonalMapper.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.user.PersonalMapper">
-    <select id="myCentre" parameterType="com.caimei.entity.CmOperationUser" resultType="com.caimei.entity.Club">
+    <select id="myCentre" parameterType="com.caimei.entity.CmMallOperationUser" resultType="com.caimei.entity.CmMallClub">
         SELECT
           c.name,
           c.userID,
@@ -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,19 +44,19 @@
         SELECT ableUserMoney FROM USER WHERE userID = #{userID}
     </select>
 
-    <select id="findAllProvince" resultType="com.caimei.entity.Province">
+    <select id="findAllProvince" resultType="com.caimei.entity.CmMallProvince">
         SELECT * FROM province WHERE validFlag = '1'
     </select>
 
-    <select id="findAllCity" resultType="com.caimei.entity.City">
+    <select id="findAllCity" resultType="com.caimei.entity.CmMallCity">
         SELECT * FROM city 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,
@@ -76,7 +76,7 @@
           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,
@@ -92,7 +92,7 @@
           AND p.validFlag = '1'
     </select>
 
-    <insert id="saveAddress" parameterType="com.caimei.entity.Address">
+    <insert id="saveAddress" parameterType="com.caimei.entity.CmMallAddress">
         INSERT INTO address (
           userID, shouHuoRen, townID, address,
           mobile, defaultFlag
@@ -104,7 +104,7 @@
           )
     </insert>
 
-    <update id="updateAddress" parameterType="com.caimei.entity.Address">
+    <update id="updateAddress" parameterType="com.caimei.entity.CmMallAddress">
         UPDATE
           address
         SET
@@ -118,10 +118,10 @@
     </update>
 
     <delete id="deleteAddress" parameterType="int">
-        DELETE FROM address WHERE addressID = #{addressID} 
+        DELETE FROM address WHERE addressID = #{addressID}
     </delete>
 
-    <select id="findDefaultAddress" resultType="com.caimei.entity.Address">
+    <select id="findDefaultAddress" resultType="com.caimei.entity.CmMallAddress">
         SELECT
           addressID,
           userID,
@@ -139,7 +139,7 @@
           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,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.ShoppingMapper">
-    <select id="findAllShop" resultType="com.caimei.entity.Shop" parameterType="int">
+    <select id="findAllShop" resultType="com.caimei.entity.CmMallShop" parameterType="int">
         SELECT
           s.*
         FROM
@@ -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,

src/main/resources/prod/application-prod.yml

@@ -6,7 +6,6 @@ spring:
 
     #数据源连接--start
   datasource:
-    driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://10.104.172.219:3306/caimei?characterEncoding=UTF8
     username: developer
     password: diKtPYZ'wToI&9#L
@@ -25,7 +24,9 @@ spring:
 #整合mybatis
 mybatis:
   #加载Mybatis映射文件
-  mapper-locations: classpath:mapper/*Mapper.xml
+  mapper-locations:
+    - classpath:mapper/*.xml
+    - classpath:caimei-search-mapper/*Mapper.xml
   #pojo别名扫描包
   type-aliases-package: com.caimei.entity
 
@@ -39,12 +40,17 @@ pagehelper:
 
 #日志配置
 logging:
-  file: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei-mall/catalina.out
-  level: debug
+  path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei-mall/catalina.out
+  level:
+    root: info
 
 miniprogram:
-  AppId: wx5a5cda32926f55ac
-  AppSecret: 1c371e72aba710949dd74bb184a3a774
   #邀请码有效时长  /天
   ValidTime: 7
-  domain: https://www.caimei365.com
+  domain: https://www.caimei365.com
+  #组织appid1....2....3,星范组织
+  AppId1: wx5a5cda32926f55ac
+  AppSecret1: 1c371e72aba710949dd74bb184a3a774
+  #采美组织
+  AppId2: wxf3cd4ae0cdd11c36
+  AppSecret2: 9bdb37d28c5e74ad3694c09c205e9bd2

src/main/resources/public/7qBjQ4SKBd.txt

@@ -0,0 +1 @@
+9bb0efd407ab28213a0e187a96644b17

src/main/resources/test/application-test.yml

@@ -6,7 +6,6 @@ spring:
 
     #数据源连接--start
   datasource:
-    driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://10.104.50.235:3306/caimei?characterEncoding=UTF8
     username: developer
     password: J5p";~OVazNl%y)?
@@ -25,7 +24,9 @@ spring:
 #整合mybatis
 mybatis:
   #加载Mybatis映射文件
-  mapper-locations: classpath:mapper/*Mapper.xml
+  mapper-locations:
+    - classpath:mapper/*.xml
+    - classpath:caimei-search-mapper/*Mapper.xml
   #pojo别名扫描包
   type-aliases-package: com.caimei.entity
 
@@ -38,12 +39,17 @@ pagehelper:
 
 #日志配置
 logging:
-  file: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei-mall/catalina.out
-  level: debug
+  path: /mnt/newdatadrive/data/runtime/tomcat-instance/caimei-mall/catalina.out
+  level:
+    root: info
 
 miniprogram:
-  AppId: wx5a5cda32926f55ac
-  AppSecret: 1c371e72aba710949dd74bb184a3a774
   #邀请码有效时长  /天
   ValidTime: 7
-  domain: https://www-b.caimei365.com
+  domain: https://www-b.caimei365.com
+  #组织appid1....2....3,星范组织
+  AppId1: wx5a5cda32926f55ac
+  AppSecret1: 1c371e72aba710949dd74bb184a3a774
+  #采美组织
+  AppId2: wxf3cd4ae0cdd11c36
+  AppSecret2: 9bdb37d28c5e74ad3694c09c205e9bd2