fixes bug

pom.xml

@@ -78,18 +78,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.caimei</groupId>
-            <artifactId>caimei-component</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.caimei</groupId>
-            <artifactId>caimei-moudles</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
         <!--struts-->
         <dependency>
             <groupId>org.apache.struts</groupId>

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

@@ -1,11 +1,11 @@
 package com.caimei;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-@MapperScan("com.caimei.**.mapper")
+/*@MapperScan("com.caimei.*")
+@ComponentScan(basePackages = {"com.caimei.*"})*/
 public class StartApplication {
 
     public static void main(String[] args) {

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

@@ -2,7 +2,7 @@ package com.caimei.controller.products;
 
 import com.caimei.entity.CmMallCart;
 import com.caimei.entity.CmMallOperationUser;
-import com.caimei.po.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallOrganizeProducts;
 import com.caimei.entity.CmWxJsonModel;
 import com.caimei.service.products.DetailsService;
 import com.caimei.service.user.LoginService;

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

@@ -1,7 +1,7 @@
 package com.caimei.controller.products;
 
 import com.caimei.entity.*;
-import com.caimei.po.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallOrganizeProducts;
 import com.caimei.service.products.HomePageService;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/caimei/controller/search/SearchController.java

@@ -3,9 +3,10 @@ package com.caimei.controller.search;
 import com.caimei.controller.user.LoginController;
 import com.caimei.entity.CmMallPage;
 import com.caimei.entity.CmWxJsonModel;
-import com.caimei.po.CmMallOrganizeProducts;
-import com.caimei.po.CmMallProductSearchHistory;
-import com.caimei.search.service.SearchService;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallProductLadderPrice;
+import com.caimei.entity.CmMallProductSearchHistory;
+import com.caimei.service.search.SearchService;
 import com.caimei.utils.AppUtils;
 import com.caimei.vo.WxJsonModel;
 import com.github.pagehelper.PageHelper;
@@ -49,8 +50,10 @@ public class SearchController {
         List<CmMallOrganizeProducts> list = searchService.searchProduct(organizeID, searchWord);
         for (CmMallOrganizeProducts products : list) {
             products.setMainImage(AppUtils.getImageURL("product", products.getMainImage(), 0, domain));
-            if (products.getLadderPriceFlag().equals("1")){
-
+            //是否启用阶梯价格
+            if (products.getLadderPriceFlag().equals("1")) {
+                CmMallProductLadderPrice ladderPrice = searchService.findLadderPrice(products.getId());
+                products.setRetailPrice(ladderPrice.getBuyPrice());
             }
         }
         CmMallPage<CmMallOrganizeProducts> productsPage = new CmMallPage<>(list);

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

@@ -0,0 +1,304 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+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 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惊喜特惠商品
+    private String validFlag;       //商品状态,1已上架,2已下架
+    private Integer preferredProductSort;       //（优选排序）排序默认为空,排序优先级1最高，空最后
+    private Integer commonlyProductSort;   //(常用排序）排序默认为空,排序优先级1最高,空最后
+    private Integer preferentialProductSort;   //（精品排序）排序默认为空,排序优先级1最高,空最后
+    private String addTime;     //添加时间
+    private String updateTime;     //更新时间
+    private String delFlag;     //是否有效状态 0 有效 其它无效
+    private String mainImage;   //主图
+    private String name;        //商品名称
+    private String unit;        //包装规格
+    private Integer productCount;  //商品数量
+    private Integer cartCount;   //购物车总数量
+    private CmMallProduct cmMallProduct;    //采美商品表
+    private List<CmMallProductImage> CmMallProductImage;  //商品图片
+    private CmMallProductDetailInfo cmMallProductDetailInfo; //商品详情
+    private CmMallShop cmMallShop;      //供应商信息
+    private String shopName;        //商品名称
+    private Integer shopID;//
+    private String productClassifyName;//商品分类名字
+    private Boolean productsChecked = false;  //商品勾选状态
+    private String postageToPay;//邮费是否到付:1是，2否[是为到付，否为不到付并非包邮具体是否包邮参考邮费规则]
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getClassifyID() {
+        return classifyID;
+    }
+
+    public void setClassifyID(Integer classifyID) {
+        this.classifyID = classifyID;
+    }
+
+    public Integer getOrganizeID() {
+        return organizeID;
+    }
+
+    public void setOrganizeID(Integer organizeID) {
+        this.organizeID = organizeID;
+    }
+
+    public Integer getProductID() {
+        return productID;
+    }
+
+    public void setProductID(Integer productID) {
+        this.productID = productID;
+    }
+
+    public Double getNormalPrice() {
+        return normalPrice;
+    }
+
+    public void setNormalPrice(Double normalPrice) {
+        this.normalPrice = normalPrice;
+    }
+
+    public Double getCostPrice() {
+        return costPrice;
+    }
+
+    public void setCostPrice(Double costPrice) {
+        this.costPrice = costPrice;
+    }
+
+    public Double getRetailPrice() {
+        return retailPrice;
+    }
+
+    public void setRetailPrice(Double retailPrice) {
+        this.retailPrice = retailPrice;
+    }
+
+    public Integer getMinBuyNumber() {
+        return minBuyNumber;
+    }
+
+    public void setMinBuyNumber(Integer minBuyNumber) {
+        this.minBuyNumber = minBuyNumber;
+    }
+
+    public String getPreferredProduct() {
+        return preferredProduct;
+    }
+
+    public void setPreferredProduct(String preferredProduct) {
+        this.preferredProduct = preferredProduct;
+    }
+
+    public String getCommonlyProduct() {
+        return commonlyProduct;
+    }
+
+    public void setCommonlyProduct(String commonlyProduct) {
+        this.commonlyProduct = commonlyProduct;
+    }
+
+    public String getPreferentialProduct() {
+        return preferentialProduct;
+    }
+
+    public void setPreferentialProduct(String preferentialProduct) {
+        this.preferentialProduct = preferentialProduct;
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public Integer getPreferredProductSort() {
+        return preferredProductSort;
+    }
+
+    public void setPreferredProductSort(Integer preferredProductSort) {
+        this.preferredProductSort = preferredProductSort;
+    }
+
+    public Integer getCommonlyProductSort() {
+        return commonlyProductSort;
+    }
+
+    public void setCommonlyProductSort(Integer commonlyProductSort) {
+        this.commonlyProductSort = commonlyProductSort;
+    }
+
+    public Integer getPreferentialProductSort() {
+        return preferentialProductSort;
+    }
+
+    public void setPreferentialProductSort(Integer preferentialProductSort) {
+        this.preferentialProductSort = preferentialProductSort;
+    }
+
+    public String getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(String addTime) {
+        this.addTime = addTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getMainImage() {
+        return mainImage;
+    }
+
+    public void setMainImage(String mainImage) {
+        this.mainImage = mainImage;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public CmMallProduct getCmMallProduct() {
+        return cmMallProduct;
+    }
+
+    public void setCmMallProduct(CmMallProduct cmMallProduct) {
+        this.cmMallProduct = cmMallProduct;
+    }
+
+    public List<CmMallProductImage> getCmMallProductImage() {
+        return CmMallProductImage;
+    }
+
+    public void setCmMallProductImage(List<CmMallProductImage> cmMallProductImage) {
+        CmMallProductImage = cmMallProductImage;
+    }
+
+    public CmMallProductDetailInfo getCmMallProductDetailInfo() {
+        return cmMallProductDetailInfo;
+    }
+
+    public void setCmMallProductDetailInfo(CmMallProductDetailInfo cmMallProductDetailInfo) {
+        this.cmMallProductDetailInfo = cmMallProductDetailInfo;
+    }
+
+    public CmMallShop getCmMallShop() {
+        return cmMallShop;
+    }
+
+    public void setCmMallShop(CmMallShop cmMallShop) {
+        this.cmMallShop = cmMallShop;
+    }
+
+    public Integer getCartCount() {
+        return cartCount;
+    }
+
+    public void setCartCount(Integer cartCount) {
+        this.cartCount = cartCount;
+    }
+
+    public Integer getProductCount() {
+        return productCount;
+    }
+
+    public void setProductCount(Integer productCount) {
+        this.productCount = productCount;
+    }
+
+    public Boolean getProductsChecked() {
+        return productsChecked;
+    }
+
+    public void setProductsChecked(Boolean productsChecked) {
+        this.productsChecked = productsChecked;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getProductClassifyName() {
+        return productClassifyName;
+    }
+
+    public void setProductClassifyName(String productClassifyName) {
+        this.productClassifyName = productClassifyName;
+    }
+
+    public Integer getShopID() {
+        return shopID;
+    }
+
+    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;
+    }
+}

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

@@ -0,0 +1,941 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CmMallProduct implements Serializable {
+    private Integer productID; //
+    private Integer brandID; //品牌Id（使用cm_brand品牌表brand供应商品牌已废弃）
+    private String brandName; //品牌名称
+    private Integer tinyTypeID; //三级分类Id
+    private Integer selfTypeID; //
+    private Integer shopID; //所属供应商Id
+    private String name; //名称
+    private String aliasName; //商品别名
+    private String productTitle;//等同于name用作于搜索改变商品名字样式时使用
+    private String searchKey; //搜索关键词
+    private String precisehKey; //精准搜索关键词
+    //private Float normalPrice; //市场价
+    //private Float price; //
+    //private Float highestUserLevelPrice; //最低价
+    //private Float lowestUserLevelPrice; //最高价
+    private Integer lowestUserLevelID; //最高价会员等级
+    private Float price0; //普通用户价格
+    private String price0Grade; //等级
+    private String price0Text; //普通显示文本
+    private String price0TextFlag;//0否 	1 是
+    private Float price1; //普通会员价
+    private String price1Grade; //等级
+    private String price1Text; //会员显示文本
+    private String price1TextFlag; //0否 1 是
+    private Float price8; //游客价
+    private String price8Grade; //等级
+    private String price8Text; //游客文本
+    private String price8TextFlag; //0否 1 是
+    private Float fee; //运费
+    private Integer stock; //库存
+    private String hasSkuFlag; //是否有sku：1有， 0没有
+    private String mainImage; //主图
+    private String propertiesInfo; //sku属性
+    private String addTime; //添加时间
+    private String updateTime; //添加时间
+    private Integer sellNumber = 0; //销量
+    private Integer weekSellNumber; //
+    private String beforeValidFlag; //
+    //private String validFlag; //商品状态，见表c_productstatus或枚举ProductStatus，0逻辑删除 1待审核 2已上架 3已下架 8审核未通过 9已冻结
+    private Integer favoriteTimes; //收藏量
+    private Float commentScore = 0f; //评论分数
+    private Integer commentTimes = 0; //评论次数
+    private String selfRecommendFlag = "0"; //
+    private String sysRecommendFlag = "0"; //
+    private Integer sortIndex; //排序值
+    private String productCode; //商品货号(商品编码)
+    private Float rate1; //
+    private Float rate2; //
+    private String unit; //包装规格
+    private String synToERPFlag; //是否推送到ERP，1已推送， 空或0未推送
+    private String allAreaFlag; //销售区域：1全部区域， 0指定区域
+    private String provinceIDs; //指定的销售区域
+    //private String serviceNumber; //服务起订量
+    //private Integer maxBuyNumber; //最大购买量
+    private String virtualFlag; //
+    //private Integer minBuyNumber; //最小购买量
+    //private Integer packageCount; //最小包装数量
+    private String byFlag; //运费：0买家承担， 1卖家承担
+    private Integer normalProductFlag; //普通商品标志 1是
+    private Integer wholeSaleProductFlag; //
+    private Integer promotionProductFlag; //
+    private Integer groupBuyProductFlag; //
+    private Integer step; //购买梯度数（编辑数量时加减的数量）
+    private String speCommisionFlag; //
+    private Float speCommision; //
+    private String videourl; //
+    private String props; //
+    private String providers; //
+    private Float serviceCommissionRatio; //
+    private Float reCommissionRatio; //
+    private String pushToERPName; // 推送到ERP的原商品名称 name字段的名称可能做修改已适应平台的搜索
+    private Integer prodBeans; // 商品具有的豆值
+    private Integer useBeansFlag; // 该商品是否可以使用采美豆购买
+    private Integer privateFlag; // 0开放市场 1私有市场
+    private String invisibleServiceProviderIDs; //
+    //private Float actPrice0; //普通用户活动价格
+    //private Float actPrice1; //普通会员活动价
+    private Date beginTime; //活动开始时间
+    private Date endTime; //活动结束时间
+    private String endTimeStr;	//活动结束时间字符串
+    private Integer actFlag; //是否活动商品：1是，空或0不是
+    private Integer actType;	// 活动类型 1推荐热销、2推荐上新、3团购促销  由于原来设计以及固定死了
+    //private Date onlineTime; // 上架时间
+    //private Date downlineTime; // 下架时间
+    private Integer shopIndexModuleID; // 商品所属供应商主页模块ID
+    private Integer displayOnCRMFlag;
+    private String moduleName; // 商品所属供应商主页模块名称
+    private String priceInfo;//价格信息（价格、文案，价格等级）
+    private String priceType;//价格类型（0价格、1文案，2价格等级）
+    private String category;	// 分类
+    private String freePostFlag = "0";//是否包邮 0包邮 1不包邮
+    //private Float costPrice;//固定成本价
+    //private Float costProportional;//比例成本价
+    //private String costCheckFlag; //成本价计算选中标志
+    private String company;
+    private String actionStr;
+    private String skill;
+    private String part;
+    private String featuredFlag;//供应商主推商品标志 0否 1是
+    private Integer featuredSortIndex;//供应商主推商品排序
+    private String priceStr; // 价格展示信息
+    private Integer bigTypeId; // 一级分类Id
+    private String cmbeanFlag;//是否采美豆专区商品(0 否,1 是
+    private Integer cmbeanPrice;//采美豆专区价格(采美豆)
+    private Integer cmbeanSort;//采美豆专区排序(值越大越前)
+    private String shopName;//商品供应商名称
+    private boolean isVisitor;//是否是游客（未注册以及从未下过单的普通用户）
+    private String ladderPriceFlag; //启用阶梯价格标识 0否 1是
+    private Integer minLadderBuyNumber; //最小阶梯价格购买量
+    private String giftFlag;//是否可以参加赠送(0:无法参加，1:可以参加赠送，2:已参加过赠送)
+    private Integer shopStatus;//供应商状态
+    private String visibility; //3:高可见度，2：中可见度,1：低可见度
+    private String surplusTime;//活动剩余时间
+    private String actSort;//活动排序
+    private String[] tagsList;//标签列表
+    private String recommendType;	//相关推荐类型 0自动选择; 1手动推荐
+    private String tags;// 商品标签用逗号隔开
+    private Boolean showfooter;//是否可以购买
+
+    public Integer getProductID() {
+        return productID;
+    }
+
+    public void setProductID(Integer productID) {
+        this.productID = productID;
+    }
+
+    public Integer getBrandID() {
+        return brandID;
+    }
+
+    public void setBrandID(Integer brandID) {
+        this.brandID = brandID;
+    }
+
+    public String getBrandName() {
+        return brandName;
+    }
+
+    public void setBrandName(String brandName) {
+        this.brandName = brandName;
+    }
+
+    public Integer getTinyTypeID() {
+        return tinyTypeID;
+    }
+
+    public void setTinyTypeID(Integer tinyTypeID) {
+        this.tinyTypeID = tinyTypeID;
+    }
+
+    public Integer getSelfTypeID() {
+        return selfTypeID;
+    }
+
+    public void setSelfTypeID(Integer selfTypeID) {
+        this.selfTypeID = selfTypeID;
+    }
+
+    public Integer getShopID() {
+        return shopID;
+    }
+
+    public void setShopID(Integer shopID) {
+        this.shopID = shopID;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAliasName() {
+        return aliasName;
+    }
+
+    public void setAliasName(String aliasName) {
+        this.aliasName = aliasName;
+    }
+
+    public String getProductTitle() {
+        return productTitle;
+    }
+
+    public void setProductTitle(String productTitle) {
+        this.productTitle = productTitle;
+    }
+
+    public String getSearchKey() {
+        return searchKey;
+    }
+
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
+
+    public String getPrecisehKey() {
+        return precisehKey;
+    }
+
+    public void setPrecisehKey(String precisehKey) {
+        this.precisehKey = precisehKey;
+    }
+
+    public Integer getLowestUserLevelID() {
+        return lowestUserLevelID;
+    }
+
+    public void setLowestUserLevelID(Integer lowestUserLevelID) {
+        this.lowestUserLevelID = lowestUserLevelID;
+    }
+
+    public Float getPrice0() {
+        return price0;
+    }
+
+    public void setPrice0(Float price0) {
+        this.price0 = price0;
+    }
+
+    public String getPrice0Grade() {
+        return price0Grade;
+    }
+
+    public void setPrice0Grade(String price0Grade) {
+        this.price0Grade = price0Grade;
+    }
+
+    public String getPrice0Text() {
+        return price0Text;
+    }
+
+    public void setPrice0Text(String price0Text) {
+        this.price0Text = price0Text;
+    }
+
+    public String getPrice0TextFlag() {
+        return price0TextFlag;
+    }
+
+    public void setPrice0TextFlag(String price0TextFlag) {
+        this.price0TextFlag = price0TextFlag;
+    }
+
+    public Float getPrice1() {
+        return price1;
+    }
+
+    public void setPrice1(Float price1) {
+        this.price1 = price1;
+    }
+
+    public String getPrice1Grade() {
+        return price1Grade;
+    }
+
+    public void setPrice1Grade(String price1Grade) {
+        this.price1Grade = price1Grade;
+    }
+
+    public String getPrice1Text() {
+        return price1Text;
+    }
+
+    public void setPrice1Text(String price1Text) {
+        this.price1Text = price1Text;
+    }
+
+    public String getPrice1TextFlag() {
+        return price1TextFlag;
+    }
+
+    public void setPrice1TextFlag(String price1TextFlag) {
+        this.price1TextFlag = price1TextFlag;
+    }
+
+    public Float getPrice8() {
+        return price8;
+    }
+
+    public void setPrice8(Float price8) {
+        this.price8 = price8;
+    }
+
+    public String getPrice8Grade() {
+        return price8Grade;
+    }
+
+    public void setPrice8Grade(String price8Grade) {
+        this.price8Grade = price8Grade;
+    }
+
+    public String getPrice8Text() {
+        return price8Text;
+    }
+
+    public void setPrice8Text(String price8Text) {
+        this.price8Text = price8Text;
+    }
+
+    public String getPrice8TextFlag() {
+        return price8TextFlag;
+    }
+
+    public void setPrice8TextFlag(String price8TextFlag) {
+        this.price8TextFlag = price8TextFlag;
+    }
+
+    public Float getFee() {
+        return fee;
+    }
+
+    public void setFee(Float fee) {
+        this.fee = fee;
+    }
+
+    public Integer getStock() {
+        return stock;
+    }
+
+    public void setStock(Integer stock) {
+        this.stock = stock;
+    }
+
+    public String getHasSkuFlag() {
+        return hasSkuFlag;
+    }
+
+    public void setHasSkuFlag(String hasSkuFlag) {
+        this.hasSkuFlag = hasSkuFlag;
+    }
+
+    public String getMainImage() {
+        return mainImage;
+    }
+
+    public void setMainImage(String mainImage) {
+        this.mainImage = mainImage;
+    }
+
+    public String getPropertiesInfo() {
+        return propertiesInfo;
+    }
+
+    public void setPropertiesInfo(String propertiesInfo) {
+        this.propertiesInfo = propertiesInfo;
+    }
+
+    public String getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(String addTime) {
+        this.addTime = addTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getSellNumber() {
+        return sellNumber;
+    }
+
+    public void setSellNumber(Integer sellNumber) {
+        this.sellNumber = sellNumber;
+    }
+
+    public Integer getWeekSellNumber() {
+        return weekSellNumber;
+    }
+
+    public void setWeekSellNumber(Integer weekSellNumber) {
+        this.weekSellNumber = weekSellNumber;
+    }
+
+    public String getBeforeValidFlag() {
+        return beforeValidFlag;
+    }
+
+    public void setBeforeValidFlag(String beforeValidFlag) {
+        this.beforeValidFlag = beforeValidFlag;
+    }
+
+    public Integer getFavoriteTimes() {
+        return favoriteTimes;
+    }
+
+    public void setFavoriteTimes(Integer favoriteTimes) {
+        this.favoriteTimes = favoriteTimes;
+    }
+
+    public Float getCommentScore() {
+        return commentScore;
+    }
+
+    public void setCommentScore(Float commentScore) {
+        this.commentScore = commentScore;
+    }
+
+    public Integer getCommentTimes() {
+        return commentTimes;
+    }
+
+    public void setCommentTimes(Integer commentTimes) {
+        this.commentTimes = commentTimes;
+    }
+
+    public String getSelfRecommendFlag() {
+        return selfRecommendFlag;
+    }
+
+    public void setSelfRecommendFlag(String selfRecommendFlag) {
+        this.selfRecommendFlag = selfRecommendFlag;
+    }
+
+    public String getSysRecommendFlag() {
+        return sysRecommendFlag;
+    }
+
+    public void setSysRecommendFlag(String sysRecommendFlag) {
+        this.sysRecommendFlag = sysRecommendFlag;
+    }
+
+    public Integer getSortIndex() {
+        return sortIndex;
+    }
+
+    public void setSortIndex(Integer sortIndex) {
+        this.sortIndex = sortIndex;
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public Float getRate1() {
+        return rate1;
+    }
+
+    public void setRate1(Float rate1) {
+        this.rate1 = rate1;
+    }
+
+    public Float getRate2() {
+        return rate2;
+    }
+
+    public void setRate2(Float rate2) {
+        this.rate2 = rate2;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public String getSynToERPFlag() {
+        return synToERPFlag;
+    }
+
+    public void setSynToERPFlag(String synToERPFlag) {
+        this.synToERPFlag = synToERPFlag;
+    }
+
+    public String getAllAreaFlag() {
+        return allAreaFlag;
+    }
+
+    public void setAllAreaFlag(String allAreaFlag) {
+        this.allAreaFlag = allAreaFlag;
+    }
+
+    public String getProvinceIDs() {
+        return provinceIDs;
+    }
+
+    public void setProvinceIDs(String provinceIDs) {
+        this.provinceIDs = provinceIDs;
+    }
+
+    public String getVirtualFlag() {
+        return virtualFlag;
+    }
+
+    public void setVirtualFlag(String virtualFlag) {
+        this.virtualFlag = virtualFlag;
+    }
+
+    public String getByFlag() {
+        return byFlag;
+    }
+
+    public void setByFlag(String byFlag) {
+        this.byFlag = byFlag;
+    }
+
+    public Integer getNormalProductFlag() {
+        return normalProductFlag;
+    }
+
+    public void setNormalProductFlag(Integer normalProductFlag) {
+        this.normalProductFlag = normalProductFlag;
+    }
+
+    public Integer getWholeSaleProductFlag() {
+        return wholeSaleProductFlag;
+    }
+
+    public void setWholeSaleProductFlag(Integer wholeSaleProductFlag) {
+        this.wholeSaleProductFlag = wholeSaleProductFlag;
+    }
+
+    public Integer getPromotionProductFlag() {
+        return promotionProductFlag;
+    }
+
+    public void setPromotionProductFlag(Integer promotionProductFlag) {
+        this.promotionProductFlag = promotionProductFlag;
+    }
+
+    public Integer getGroupBuyProductFlag() {
+        return groupBuyProductFlag;
+    }
+
+    public void setGroupBuyProductFlag(Integer groupBuyProductFlag) {
+        this.groupBuyProductFlag = groupBuyProductFlag;
+    }
+
+    public Integer getStep() {
+        return step;
+    }
+
+    public void setStep(Integer step) {
+        this.step = step;
+    }
+
+    public String getSpeCommisionFlag() {
+        return speCommisionFlag;
+    }
+
+    public void setSpeCommisionFlag(String speCommisionFlag) {
+        this.speCommisionFlag = speCommisionFlag;
+    }
+
+    public Float getSpeCommision() {
+        return speCommision;
+    }
+
+    public void setSpeCommision(Float speCommision) {
+        this.speCommision = speCommision;
+    }
+
+    public String getVideourl() {
+        return videourl;
+    }
+
+    public void setVideourl(String videourl) {
+        this.videourl = videourl;
+    }
+
+    public String getProps() {
+        return props;
+    }
+
+    public void setProps(String props) {
+        this.props = props;
+    }
+
+    public String getProviders() {
+        return providers;
+    }
+
+    public void setProviders(String providers) {
+        this.providers = providers;
+    }
+
+    public Float getServiceCommissionRatio() {
+        return serviceCommissionRatio;
+    }
+
+    public void setServiceCommissionRatio(Float serviceCommissionRatio) {
+        this.serviceCommissionRatio = serviceCommissionRatio;
+    }
+
+    public Float getReCommissionRatio() {
+        return reCommissionRatio;
+    }
+
+    public void setReCommissionRatio(Float reCommissionRatio) {
+        this.reCommissionRatio = reCommissionRatio;
+    }
+
+    public String getPushToERPName() {
+        return pushToERPName;
+    }
+
+    public void setPushToERPName(String pushToERPName) {
+        this.pushToERPName = pushToERPName;
+    }
+
+    public Integer getProdBeans() {
+        return prodBeans;
+    }
+
+    public void setProdBeans(Integer prodBeans) {
+        this.prodBeans = prodBeans;
+    }
+
+    public Integer getUseBeansFlag() {
+        return useBeansFlag;
+    }
+
+    public void setUseBeansFlag(Integer useBeansFlag) {
+        this.useBeansFlag = useBeansFlag;
+    }
+
+    public Integer getPrivateFlag() {
+        return privateFlag;
+    }
+
+    public void setPrivateFlag(Integer privateFlag) {
+        this.privateFlag = privateFlag;
+    }
+
+    public String getInvisibleServiceProviderIDs() {
+        return invisibleServiceProviderIDs;
+    }
+
+    public void setInvisibleServiceProviderIDs(String invisibleServiceProviderIDs) {
+        this.invisibleServiceProviderIDs = invisibleServiceProviderIDs;
+    }
+
+    public Date getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Date beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getEndTimeStr() {
+        return endTimeStr;
+    }
+
+    public void setEndTimeStr(String endTimeStr) {
+        this.endTimeStr = endTimeStr;
+    }
+
+    public Integer getActFlag() {
+        return actFlag;
+    }
+
+    public void setActFlag(Integer actFlag) {
+        this.actFlag = actFlag;
+    }
+
+    public Integer getActType() {
+        return actType;
+    }
+
+    public void setActType(Integer actType) {
+        this.actType = actType;
+    }
+
+    public Integer getShopIndexModuleID() {
+        return shopIndexModuleID;
+    }
+
+    public void setShopIndexModuleID(Integer shopIndexModuleID) {
+        this.shopIndexModuleID = shopIndexModuleID;
+    }
+
+    public Integer getDisplayOnCRMFlag() {
+        return displayOnCRMFlag;
+    }
+
+    public void setDisplayOnCRMFlag(Integer displayOnCRMFlag) {
+        this.displayOnCRMFlag = displayOnCRMFlag;
+    }
+
+    public String getModuleName() {
+        return moduleName;
+    }
+
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
+    }
+
+    public String getPriceInfo() {
+        return priceInfo;
+    }
+
+    public void setPriceInfo(String priceInfo) {
+        this.priceInfo = priceInfo;
+    }
+
+    public String getPriceType() {
+        return priceType;
+    }
+
+    public void setPriceType(String priceType) {
+        this.priceType = priceType;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getFreePostFlag() {
+        return freePostFlag;
+    }
+
+    public void setFreePostFlag(String freePostFlag) {
+        this.freePostFlag = freePostFlag;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public String getActionStr() {
+        return actionStr;
+    }
+
+    public void setActionStr(String actionStr) {
+        this.actionStr = actionStr;
+    }
+
+    public String getSkill() {
+        return skill;
+    }
+
+    public void setSkill(String skill) {
+        this.skill = skill;
+    }
+
+    public String getPart() {
+        return part;
+    }
+
+    public void setPart(String part) {
+        this.part = part;
+    }
+
+    public String getFeaturedFlag() {
+        return featuredFlag;
+    }
+
+    public void setFeaturedFlag(String featuredFlag) {
+        this.featuredFlag = featuredFlag;
+    }
+
+    public Integer getFeaturedSortIndex() {
+        return featuredSortIndex;
+    }
+
+    public void setFeaturedSortIndex(Integer featuredSortIndex) {
+        this.featuredSortIndex = featuredSortIndex;
+    }
+
+    public String getPriceStr() {
+        return priceStr;
+    }
+
+    public void setPriceStr(String priceStr) {
+        this.priceStr = priceStr;
+    }
+
+    public Integer getBigTypeId() {
+        return bigTypeId;
+    }
+
+    public void setBigTypeId(Integer bigTypeId) {
+        this.bigTypeId = bigTypeId;
+    }
+
+    public String getCmbeanFlag() {
+        return cmbeanFlag;
+    }
+
+    public void setCmbeanFlag(String cmbeanFlag) {
+        this.cmbeanFlag = cmbeanFlag;
+    }
+
+    public Integer getCmbeanPrice() {
+        return cmbeanPrice;
+    }
+
+    public void setCmbeanPrice(Integer cmbeanPrice) {
+        this.cmbeanPrice = cmbeanPrice;
+    }
+
+    public Integer getCmbeanSort() {
+        return cmbeanSort;
+    }
+
+    public void setCmbeanSort(Integer cmbeanSort) {
+        this.cmbeanSort = cmbeanSort;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public boolean isVisitor() {
+        return isVisitor;
+    }
+
+    public void setVisitor(boolean visitor) {
+        isVisitor = visitor;
+    }
+
+    public String getLadderPriceFlag() {
+        return ladderPriceFlag;
+    }
+
+    public void setLadderPriceFlag(String ladderPriceFlag) {
+        this.ladderPriceFlag = ladderPriceFlag;
+    }
+
+    public Integer getMinLadderBuyNumber() {
+        return minLadderBuyNumber;
+    }
+
+    public void setMinLadderBuyNumber(Integer minLadderBuyNumber) {
+        this.minLadderBuyNumber = minLadderBuyNumber;
+    }
+
+    public String getGiftFlag() {
+        return giftFlag;
+    }
+
+    public void setGiftFlag(String giftFlag) {
+        this.giftFlag = giftFlag;
+    }
+
+    public Integer getShopStatus() {
+        return shopStatus;
+    }
+
+    public void setShopStatus(Integer shopStatus) {
+        this.shopStatus = shopStatus;
+    }
+
+    public String getVisibility() {
+        return visibility;
+    }
+
+    public void setVisibility(String visibility) {
+        this.visibility = visibility;
+    }
+
+    public String getSurplusTime() {
+        return surplusTime;
+    }
+
+    public void setSurplusTime(String surplusTime) {
+        this.surplusTime = surplusTime;
+    }
+
+    public String getActSort() {
+        return actSort;
+    }
+
+    public void setActSort(String actSort) {
+        this.actSort = actSort;
+    }
+
+    public String[] getTagsList() {
+        return tagsList;
+    }
+
+    public void setTagsList(String[] tagsList) {
+        this.tagsList = tagsList;
+    }
+
+    public String getRecommendType() {
+        return recommendType;
+    }
+
+    public void setRecommendType(String recommendType) {
+        this.recommendType = recommendType;
+    }
+
+    public String getTags() {
+        return tags;
+    }
+
+    public void setTags(String tags) {
+        this.tags = tags;
+    }
+
+    public Boolean getShowfooter() {
+        return showfooter;
+    }
+
+    public void setShowfooter(Boolean showfooter) {
+        this.showfooter = showfooter;
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+
+public class CmMallProductDetailInfo implements Serializable {
+    private Integer productDetailInfoID;
+    private Integer productID;  //商品Id
+    private String propValueAlias;
+    private String propValueImages;
+    private String detailInfo;     //商品详情信息
+    private String detailInfoTxt;
+    private String seoTitle;
+    private String seoKeyword;
+    private String seoDes;
+    private String serviceInfo;    //服务详情
+    private String orderInfo;      //订购方案
+
+    public Integer getProductDetailInfoID() {
+        return productDetailInfoID;
+    }
+
+    public void setProductDetailInfoID(Integer productDetailInfoID) {
+        this.productDetailInfoID = productDetailInfoID;
+    }
+
+    public Integer getProductID() {
+        return productID;
+    }
+
+    public void setProductID(Integer productID) {
+        this.productID = productID;
+    }
+
+    public String getPropValueAlias() {
+        return propValueAlias;
+    }
+
+    public void setPropValueAlias(String propValueAlias) {
+        this.propValueAlias = propValueAlias;
+    }
+
+    public String getPropValueImages() {
+        return propValueImages;
+    }
+
+    public void setPropValueImages(String propValueImages) {
+        this.propValueImages = propValueImages;
+    }
+
+    public String getDetailInfo() {
+        return detailInfo;
+    }
+
+    public void setDetailInfo(String detailInfo) {
+        this.detailInfo = detailInfo;
+    }
+
+    public String getDetailInfoTxt() {
+        return detailInfoTxt;
+    }
+
+    public void setDetailInfoTxt(String detailInfoTxt) {
+        this.detailInfoTxt = detailInfoTxt;
+    }
+
+    public String getSeoTitle() {
+        return seoTitle;
+    }
+
+    public void setSeoTitle(String seoTitle) {
+        this.seoTitle = seoTitle;
+    }
+
+    public String getSeoKeyword() {
+        return seoKeyword;
+    }
+
+    public void setSeoKeyword(String seoKeyword) {
+        this.seoKeyword = seoKeyword;
+    }
+
+    public String getSeoDes() {
+        return seoDes;
+    }
+
+    public void setSeoDes(String seoDes) {
+        this.seoDes = seoDes;
+    }
+
+    public String getServiceInfo() {
+        return serviceInfo;
+    }
+
+    public void setServiceInfo(String serviceInfo) {
+        this.serviceInfo = serviceInfo;
+    }
+
+    public String getOrderInfo() {
+        return orderInfo;
+    }
+
+    public void setOrderInfo(String orderInfo) {
+        this.orderInfo = orderInfo;
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+
+public class CmMallProductImage implements Serializable {
+    private Integer productImageID; //
+    private Integer productID; //商品Id
+    private Integer shopID; //商品对应供应商Id
+    private String addTime; //添加时间
+    private String image; //图片
+    private String mainFlag; //是否主图：1是，空或0不是
+    private Integer sortIndex; //排序值
+
+    public Integer getProductImageID() {
+        return productImageID;
+    }
+
+    public void setProductImageID(Integer productImageID) {
+        this.productImageID = productImageID;
+    }
+
+    public Integer getProductID() {
+        return productID;
+    }
+
+    public void setProductID(Integer productID) {
+        this.productID = productID;
+    }
+
+    public Integer getShopID() {
+        return shopID;
+    }
+
+    public void setShopID(Integer shopID) {
+        this.shopID = shopID;
+    }
+
+    public String getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(String addTime) {
+        this.addTime = addTime;
+    }
+
+    public String getImage() {
+        return image;
+    }
+
+    public void setImage(String image) {
+        this.image = image;
+    }
+
+    public String getMainFlag() {
+        return mainFlag;
+    }
+
+    public void setMainFlag(String mainFlag) {
+        this.mainFlag = mainFlag;
+    }
+
+    public Integer getSortIndex() {
+        return sortIndex;
+    }
+
+    public void setSortIndex(Integer sortIndex) {
+        this.sortIndex = sortIndex;
+    }
+}

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

@@ -0,0 +1,88 @@
+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 否，其余是
+
+    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;
+    }
+}

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

@@ -0,0 +1,754 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class CmMallShop implements Serializable {
+    private Integer shopID; //
+    private Integer userID; //
+    private String name; //
+    private String sname;//简称
+    private String nameEn; //
+    private String site; //
+    private String logo; //
+    private Float level; //
+    private Float score; //
+    private Integer productCount; //
+    private String legalPerson; //
+    private String businessLicense; //
+    private String businessLicenseImage; //
+    private String taxCertificate; //
+    private String taxCertificateImage; //
+    private Integer townID; //
+    private Integer provinceID;
+    private Integer cityID;
+    private String address; //
+    private Float registeredCapital; //
+    private String nature; //
+    private Float turnover; //
+    private String linkMan; //
+    private String contractPhone; //
+    private String contractMobile; //
+    private String fax; //
+    private String zipCode; //
+    private String linkMan1; //
+    private String duty1; //
+    private String contractPhone1; //
+    private String contractMobile1; //
+    private String contractQQ1; //
+    private String wechat1; //
+    private String contractEmail1; //
+    private String linkMan2; //
+    private String duty2; //
+    private String contractPhone2; //
+    private String contractMobile2; //
+    private String contractQQ2; //
+    private String wechat2; //
+    private String contractEmail2; //
+    private String scope; //
+    private String info; //
+    private String productDesc; //主打系列产品介绍
+    private Double lng = 0d; //
+    private Double lat = 0d; //
+    private String addTime; //
+    private String auditStatus; //
+    private String auditTime; //
+    private String auditNote; //
+    private Integer favoriteTimes = 0; //
+    private String validFlag; //
+    private String payFlag1; //
+    private String auditFlag1; //
+    private String payFlag2; //
+    private String auditFlag2; //
+    private String payFlag3; //
+    private String auditFlag3; //
+    private String note; //
+    private Integer status; //
+    private Integer sortIndex; //
+    private Float rate1; //
+    private Float rate2; //
+    private String masterFlag; //
+    private String erpFlag; //
+    private String shopSecret; //
+    private String masterLogo; //
+    private String cooperateFlag; //
+    private String businessScope; //
+    private Integer bail; // 是否已缴纳保证金(0 没有,1 有)
+    private String mainpro;
+    private Integer shopScore; // 供应商评分
+    private String[] businessScopeArray; // 经营范围的数组形式
+    private String socialCreditCode; // 统一社会信用代码
+    private String firstShopType;
+    private String secondShopType;
+    private String medicalPracticeLicenseImg1;
+    private String medicalPracticeLicenseImg2;
+    private String medicalPracticeLicenseImg3;
+    private Double totalPrice;
+    private List<CmMallOrganizeProducts> productsList;  //商品集合
+    private Boolean checked = false; //勾选状态
+    private Integer checkedCount = 0;  //商铺下商品选中数量
+
+    public Integer getShopID() {
+        return shopID;
+    }
+
+    public void setShopID(Integer shopID) {
+        this.shopID = shopID;
+    }
+
+    public Integer getUserID() {
+        return userID;
+    }
+
+    public void setUserID(Integer userID) {
+        this.userID = userID;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSname() {
+        return sname;
+    }
+
+    public void setSname(String sname) {
+        this.sname = sname;
+    }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(String logo) {
+        this.logo = logo;
+    }
+
+    public Float getLevel() {
+        return level;
+    }
+
+    public void setLevel(Float level) {
+        this.level = level;
+    }
+
+    public Float getScore() {
+        return score;
+    }
+
+    public void setScore(Float score) {
+        this.score = score;
+    }
+
+    public Integer getProductCount() {
+        return productCount;
+    }
+
+    public void setProductCount(Integer productCount) {
+        this.productCount = productCount;
+    }
+
+    public String getLegalPerson() {
+        return legalPerson;
+    }
+
+    public void setLegalPerson(String legalPerson) {
+        this.legalPerson = legalPerson;
+    }
+
+    public String getBusinessLicense() {
+        return businessLicense;
+    }
+
+    public void setBusinessLicense(String businessLicense) {
+        this.businessLicense = businessLicense;
+    }
+
+    public String getBusinessLicenseImage() {
+        return businessLicenseImage;
+    }
+
+    public void setBusinessLicenseImage(String businessLicenseImage) {
+        this.businessLicenseImage = businessLicenseImage;
+    }
+
+    public String getTaxCertificate() {
+        return taxCertificate;
+    }
+
+    public void setTaxCertificate(String taxCertificate) {
+        this.taxCertificate = taxCertificate;
+    }
+
+    public String getTaxCertificateImage() {
+        return taxCertificateImage;
+    }
+
+    public void setTaxCertificateImage(String taxCertificateImage) {
+        this.taxCertificateImage = taxCertificateImage;
+    }
+
+    public Integer getTownID() {
+        return townID;
+    }
+
+    public void setTownID(Integer townID) {
+        this.townID = townID;
+    }
+
+    public Integer getProvinceID() {
+        return provinceID;
+    }
+
+    public void setProvinceID(Integer provinceID) {
+        this.provinceID = provinceID;
+    }
+
+    public Integer getCityID() {
+        return cityID;
+    }
+
+    public void setCityID(Integer cityID) {
+        this.cityID = cityID;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Float getRegisteredCapital() {
+        return registeredCapital;
+    }
+
+    public void setRegisteredCapital(Float registeredCapital) {
+        this.registeredCapital = registeredCapital;
+    }
+
+    public String getNature() {
+        return nature;
+    }
+
+    public void setNature(String nature) {
+        this.nature = nature;
+    }
+
+    public Float getTurnover() {
+        return turnover;
+    }
+
+    public void setTurnover(Float turnover) {
+        this.turnover = turnover;
+    }
+
+    public String getLinkMan() {
+        return linkMan;
+    }
+
+    public void setLinkMan(String linkMan) {
+        this.linkMan = linkMan;
+    }
+
+    public String getContractPhone() {
+        return contractPhone;
+    }
+
+    public void setContractPhone(String contractPhone) {
+        this.contractPhone = contractPhone;
+    }
+
+    public String getContractMobile() {
+        return contractMobile;
+    }
+
+    public void setContractMobile(String contractMobile) {
+        this.contractMobile = contractMobile;
+    }
+
+    public String getFax() {
+        return fax;
+    }
+
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    public String getZipCode() {
+        return zipCode;
+    }
+
+    public void setZipCode(String zipCode) {
+        this.zipCode = zipCode;
+    }
+
+    public String getLinkMan1() {
+        return linkMan1;
+    }
+
+    public void setLinkMan1(String linkMan1) {
+        this.linkMan1 = linkMan1;
+    }
+
+    public String getDuty1() {
+        return duty1;
+    }
+
+    public void setDuty1(String duty1) {
+        this.duty1 = duty1;
+    }
+
+    public String getContractPhone1() {
+        return contractPhone1;
+    }
+
+    public void setContractPhone1(String contractPhone1) {
+        this.contractPhone1 = contractPhone1;
+    }
+
+    public String getContractMobile1() {
+        return contractMobile1;
+    }
+
+    public void setContractMobile1(String contractMobile1) {
+        this.contractMobile1 = contractMobile1;
+    }
+
+    public String getContractQQ1() {
+        return contractQQ1;
+    }
+
+    public void setContractQQ1(String contractQQ1) {
+        this.contractQQ1 = contractQQ1;
+    }
+
+    public String getWechat1() {
+        return wechat1;
+    }
+
+    public void setWechat1(String wechat1) {
+        this.wechat1 = wechat1;
+    }
+
+    public String getContractEmail1() {
+        return contractEmail1;
+    }
+
+    public void setContractEmail1(String contractEmail1) {
+        this.contractEmail1 = contractEmail1;
+    }
+
+    public String getLinkMan2() {
+        return linkMan2;
+    }
+
+    public void setLinkMan2(String linkMan2) {
+        this.linkMan2 = linkMan2;
+    }
+
+    public String getDuty2() {
+        return duty2;
+    }
+
+    public void setDuty2(String duty2) {
+        this.duty2 = duty2;
+    }
+
+    public String getContractPhone2() {
+        return contractPhone2;
+    }
+
+    public void setContractPhone2(String contractPhone2) {
+        this.contractPhone2 = contractPhone2;
+    }
+
+    public String getContractMobile2() {
+        return contractMobile2;
+    }
+
+    public void setContractMobile2(String contractMobile2) {
+        this.contractMobile2 = contractMobile2;
+    }
+
+    public String getContractQQ2() {
+        return contractQQ2;
+    }
+
+    public void setContractQQ2(String contractQQ2) {
+        this.contractQQ2 = contractQQ2;
+    }
+
+    public String getWechat2() {
+        return wechat2;
+    }
+
+    public void setWechat2(String wechat2) {
+        this.wechat2 = wechat2;
+    }
+
+    public String getContractEmail2() {
+        return contractEmail2;
+    }
+
+    public void setContractEmail2(String contractEmail2) {
+        this.contractEmail2 = contractEmail2;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getProductDesc() {
+        return productDesc;
+    }
+
+    public void setProductDesc(String productDesc) {
+        this.productDesc = productDesc;
+    }
+
+    public Double getLng() {
+        return lng;
+    }
+
+    public void setLng(Double lng) {
+        this.lng = lng;
+    }
+
+    public Double getLat() {
+        return lat;
+    }
+
+    public void setLat(Double lat) {
+        this.lat = lat;
+    }
+
+    public String getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(String addTime) {
+        this.addTime = addTime;
+    }
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(String auditTime) {
+        this.auditTime = auditTime;
+    }
+
+    public String getAuditNote() {
+        return auditNote;
+    }
+
+    public void setAuditNote(String auditNote) {
+        this.auditNote = auditNote;
+    }
+
+    public Integer getFavoriteTimes() {
+        return favoriteTimes;
+    }
+
+    public void setFavoriteTimes(Integer favoriteTimes) {
+        this.favoriteTimes = favoriteTimes;
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public String getPayFlag1() {
+        return payFlag1;
+    }
+
+    public void setPayFlag1(String payFlag1) {
+        this.payFlag1 = payFlag1;
+    }
+
+    public String getAuditFlag1() {
+        return auditFlag1;
+    }
+
+    public void setAuditFlag1(String auditFlag1) {
+        this.auditFlag1 = auditFlag1;
+    }
+
+    public String getPayFlag2() {
+        return payFlag2;
+    }
+
+    public void setPayFlag2(String payFlag2) {
+        this.payFlag2 = payFlag2;
+    }
+
+    public String getAuditFlag2() {
+        return auditFlag2;
+    }
+
+    public void setAuditFlag2(String auditFlag2) {
+        this.auditFlag2 = auditFlag2;
+    }
+
+    public String getPayFlag3() {
+        return payFlag3;
+    }
+
+    public void setPayFlag3(String payFlag3) {
+        this.payFlag3 = payFlag3;
+    }
+
+    public String getAuditFlag3() {
+        return auditFlag3;
+    }
+
+    public void setAuditFlag3(String auditFlag3) {
+        this.auditFlag3 = auditFlag3;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getSortIndex() {
+        return sortIndex;
+    }
+
+    public void setSortIndex(Integer sortIndex) {
+        this.sortIndex = sortIndex;
+    }
+
+    public Float getRate1() {
+        return rate1;
+    }
+
+    public void setRate1(Float rate1) {
+        this.rate1 = rate1;
+    }
+
+    public Float getRate2() {
+        return rate2;
+    }
+
+    public void setRate2(Float rate2) {
+        this.rate2 = rate2;
+    }
+
+    public String getMasterFlag() {
+        return masterFlag;
+    }
+
+    public void setMasterFlag(String masterFlag) {
+        this.masterFlag = masterFlag;
+    }
+
+    public String getErpFlag() {
+        return erpFlag;
+    }
+
+    public void setErpFlag(String erpFlag) {
+        this.erpFlag = erpFlag;
+    }
+
+    public String getShopSecret() {
+        return shopSecret;
+    }
+
+    public void setShopSecret(String shopSecret) {
+        this.shopSecret = shopSecret;
+    }
+
+    public String getMasterLogo() {
+        return masterLogo;
+    }
+
+    public void setMasterLogo(String masterLogo) {
+        this.masterLogo = masterLogo;
+    }
+
+    public String getCooperateFlag() {
+        return cooperateFlag;
+    }
+
+    public void setCooperateFlag(String cooperateFlag) {
+        this.cooperateFlag = cooperateFlag;
+    }
+
+    public String getBusinessScope() {
+        return businessScope;
+    }
+
+    public void setBusinessScope(String businessScope) {
+        this.businessScope = businessScope;
+    }
+
+    public Integer getBail() {
+        return bail;
+    }
+
+    public void setBail(Integer bail) {
+        this.bail = bail;
+    }
+
+    public String getMainpro() {
+        return mainpro;
+    }
+
+    public void setMainpro(String mainpro) {
+        this.mainpro = mainpro;
+    }
+
+    public Integer getShopScore() {
+        return shopScore;
+    }
+
+    public void setShopScore(Integer shopScore) {
+        this.shopScore = shopScore;
+    }
+
+    public String[] getBusinessScopeArray() {
+        return businessScopeArray;
+    }
+
+    public void setBusinessScopeArray(String[] businessScopeArray) {
+        this.businessScopeArray = businessScopeArray;
+    }
+
+    public String getSocialCreditCode() {
+        return socialCreditCode;
+    }
+
+    public void setSocialCreditCode(String socialCreditCode) {
+        this.socialCreditCode = socialCreditCode;
+    }
+
+    public String getFirstShopType() {
+        return firstShopType;
+    }
+
+    public void setFirstShopType(String firstShopType) {
+        this.firstShopType = firstShopType;
+    }
+
+    public String getSecondShopType() {
+        return secondShopType;
+    }
+
+    public void setSecondShopType(String secondShopType) {
+        this.secondShopType = secondShopType;
+    }
+
+    public String getMedicalPracticeLicenseImg1() {
+        return medicalPracticeLicenseImg1;
+    }
+
+    public void setMedicalPracticeLicenseImg1(String medicalPracticeLicenseImg1) {
+        this.medicalPracticeLicenseImg1 = medicalPracticeLicenseImg1;
+    }
+
+    public String getMedicalPracticeLicenseImg2() {
+        return medicalPracticeLicenseImg2;
+    }
+
+    public void setMedicalPracticeLicenseImg2(String medicalPracticeLicenseImg2) {
+        this.medicalPracticeLicenseImg2 = medicalPracticeLicenseImg2;
+    }
+
+    public String getMedicalPracticeLicenseImg3() {
+        return medicalPracticeLicenseImg3;
+    }
+
+    public void setMedicalPracticeLicenseImg3(String medicalPracticeLicenseImg3) {
+        this.medicalPracticeLicenseImg3 = medicalPracticeLicenseImg3;
+    }
+
+    public List<CmMallOrganizeProducts> getProductsList() {
+        return productsList;
+    }
+
+    public void setProductsList(List<CmMallOrganizeProducts> productsList) {
+        this.productsList = productsList;
+    }
+
+    public Double getTotalPrice() {
+        return totalPrice;
+    }
+
+    public void setTotalPrice(Double totalPrice) {
+        this.totalPrice = totalPrice;
+    }
+
+    public Boolean getChecked() {
+        return checked;
+    }
+
+    public void setChecked(Boolean checked) {
+        this.checked = checked;
+    }
+
+    public Integer getCheckedCount() {
+        return checkedCount;
+    }
+
+    public void setCheckedCount(Integer checkedCount) {
+        this.checkedCount = checkedCount;
+    }
+}

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

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface CmShopOrderMapper {
+public interface CmMallShopOrderMapper {
 
     List<CmMallShopOrder> findList(CmMallShopOrder cmMallShopOrder);
 

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

@@ -1,8 +1,8 @@
 package com.caimei.mapper.order;
 
 import com.caimei.entity.*;
-import com.caimei.po.CmMallOrganizeProducts;
-import com.caimei.po.CmMallShop;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallShop;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -1,7 +1,6 @@
 package com.caimei.mapper.products;
 
 import com.caimei.entity.*;
-import com.caimei.po.*;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

@@ -1,7 +1,7 @@
 package com.caimei.mapper.products;
 
 import com.caimei.entity.*;
-import com.caimei.po.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallOrganizeProducts;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

@@ -1,8 +1,8 @@
 package com.caimei.mapper.products;
 
 import com.caimei.entity.CmMallOrderProduct;
-import com.caimei.po.CmMallOrganizeProducts;
-import com.caimei.po.CmMallProduct;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallProduct;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -1,8 +1,8 @@
 package com.caimei.mapper.products;
 
 import com.caimei.entity.CmMallCart;
-import com.caimei.po.CmMallOrganizeProducts;
-import com.caimei.po.CmMallShop;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallShop;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/caimei/mapper/search/SearchMapper.java

@@ -0,0 +1,22 @@
+package com.caimei.mapper.search;
+
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallProductLadderPrice;
+import com.caimei.entity.CmMallProductSearchHistory;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface SearchMapper {
+    List<CmMallOrganizeProducts> searchProduct(@Param("organizeID") Integer organizeID, @Param("searchWord") String searchWord);
+
+    void deleteProductRecord(@Param("organizeID") Integer organizeID, @Param("openID") String openID);
+
+    void saveProductRecord(CmMallProductSearchHistory productSearchHistory);
+
+    CmMallProductLadderPrice findLadderPrice(Integer id);
+
+    List<CmMallProductSearchHistory> findProductRecord(@Param("organizeID") Integer organizeID, @Param("openID") String openID);
+}

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

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
-public interface AddressMapper {
+public interface CmMallAddressMapper {
 
     List<CmMallAddress> findByUserId(Integer userID);
 

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

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
-public interface UserMapper {
+public interface CmMallUserMapper {
 
 	/**
 	 * 通过用户Id获取用户信息

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

@@ -3,19 +3,19 @@ package com.caimei.service.order.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.caimei.entity.*;
 import com.caimei.mapper.order.BpUserInfoMapper;
-import com.caimei.mapper.order.CmShopOrderMapper;
+import com.caimei.mapper.order.CmMallShopOrderMapper;
 import com.caimei.mapper.order.OrderMapper;
 import com.caimei.mapper.order.OrderProductMapper;
 import com.caimei.mapper.products.HomePageMapper;
 import com.caimei.mapper.products.OrganizeProductsMapper;
 import com.caimei.mapper.products.ShoppingMapper;
-import com.caimei.mapper.user.AddressMapper;
+import com.caimei.mapper.user.CmMallAddressMapper;
 import com.caimei.mapper.user.LoginMapper;
 import com.caimei.mapper.user.PersonalMapper;
-import com.caimei.mapper.user.UserMapper;
-import com.caimei.po.CmMallOrganizeProducts;
-import com.caimei.po.CmMallProduct;
-import com.caimei.po.CmMallShop;
+import com.caimei.mapper.user.CmMallUserMapper;
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallProduct;
+import com.caimei.entity.CmMallShop;
 import com.caimei.service.order.OrderService;
 import com.caimei.utils.AppUtils;
 import com.caimei.utils.MathUtil;
@@ -46,19 +46,19 @@ public class OrderServiceImpl implements OrderService {
     @Autowired
     private LoginMapper loginMapper;
     @Autowired
-    private UserMapper userMapper;
+    private CmMallUserMapper cmMallUserMapper;
     @Autowired
     private OrganizeProductsMapper organizeProductsMapper;
     @Autowired
     private OrderProductMapper orderProductMapper;
     @Autowired
-    private CmShopOrderMapper cmShopOrderMapper;
+    private CmMallShopOrderMapper cmMallShopOrderMapper;
     @Autowired
     private HomePageMapper homePageMapper;
     @Autowired
     private BpUserInfoMapper bpUserInfoMapper;
     @Autowired
-    private AddressMapper addressMapper;
+    private CmMallAddressMapper cmMallAddressMapper;
     @Autowired
     private ShoppingMapper shoppingMapper;
 
@@ -289,7 +289,7 @@ public class OrderServiceImpl implements OrderService {
     @Transactional
     public CmWxJsonModel saveOrderInfo(CmWxJsonModel cmWxJsonModel, Integer userId, Integer organizeID, String cartType, Integer addressID, Object orderInfo, String balanceDeductionFlag, Double orderShouldPayFee, Integer cmOperationID) {
         /**获取用户信息*/
-        CmMallUser cmMallUser = userMapper.findUserById(userId);
+        CmMallUser cmMallUser = cmMallUserMapper.findUserById(userId);
         /**获取用户包邮卡*/
         CmMallFreePostageCard cmMallFreePostageCard = orderMapper.queryFree(userId);
         if (null == cmMallUser) {
@@ -440,16 +440,16 @@ public class OrderServiceImpl implements OrderService {
                         payableAmount = bdPayTotalFee.subtract(bdUserMoney);
                         cmMallUser.setUserMoney(new BigDecimal(0));//余额抵扣用完
                         cmMallUser.setAbleUserMoney(new BigDecimal(0));//余额抵扣用完
-                        userMapper.updateUserMoney(cmMallUser);
-                        userMapper.updateAbleUserMoney(cmMallUser);
+                        cmMallUserMapper.updateUserMoney(cmMallUser);
+                        cmMallUserMapper.updateAbleUserMoney(cmMallUser);
                         cmMallOrder.setStatus(21);//部收款待发货
                         cmMallOrder.setReceiptStatus("2");
                     } else if (payTotalFee < userMoney) {//全部用余额抵扣，无需直接，直接变成支付完成
                         balancePayFee = payTotalFee;
                         cmMallUser.setAbleUserMoney(bdUserMoney.subtract(bdPayTotalFee));
                         cmMallUser.setUserMoney(bdUserMoney.subtract(bdPayTotalFee));
-                        userMapper.updateAbleUserMoney(cmMallUser);
-                        userMapper.updateUserMoney(cmMallUser);
+                        cmMallUserMapper.updateAbleUserMoney(cmMallUser);
+                        cmMallUserMapper.updateUserMoney(cmMallUser);
                         cmMallOrder.setStatus(31);//已收款待发货
                         cmMallOrder.setReceiptStatus("3");
                         cmMallOrder.setPayFlag("1");
@@ -458,8 +458,8 @@ public class OrderServiceImpl implements OrderService {
                         balancePayFee = payTotalFee;
                         cmMallUser.setAbleUserMoney(new BigDecimal(0));
                         cmMallUser.setUserMoney(new BigDecimal(0));
-                        userMapper.updateAbleUserMoney(cmMallUser);
-                        userMapper.updateUserMoney(cmMallUser);
+                        cmMallUserMapper.updateAbleUserMoney(cmMallUser);
+                        cmMallUserMapper.updateUserMoney(cmMallUser);
                         cmMallOrder.setStatus(31);//已收款待发货
                         cmMallOrder.setReceiptStatus("3");
                         cmMallOrder.setPayFlag("1");
@@ -538,7 +538,7 @@ public class OrderServiceImpl implements OrderService {
                 cmMallUserBalanceRecord.setAmount(String.valueOf(balancePayFee));
                 cmMallUserBalanceRecord.setOrderId(cmMallOrder.getOrderID());
                 cmMallUserBalanceRecord.setDelFlag("0");
-                userMapper.insertUserBalanceRecord(cmMallUserBalanceRecord);
+                cmMallUserMapper.insertUserBalanceRecord(cmMallUserBalanceRecord);
             }
 
             /**保存订单商品*/
@@ -625,7 +625,7 @@ public class OrderServiceImpl implements OrderService {
                 cmMallShopOrder.setShopOtherFee(0D);//付第三方
                 cmMallShopOrder.setSplitFlag("0");
 
-                List<CmMallShopOrder> cmMallShopOrders1 = cmShopOrderMapper.findMaxShopOrderNo(cmMallOrder.getOrderID());
+                List<CmMallShopOrder> cmMallShopOrders1 = cmMallShopOrderMapper.findMaxShopOrderNo(cmMallOrder.getOrderID());
                 String shopOrderNo = ""; //子订单编号
                 if (!CollectionUtils.isEmpty(cmMallShopOrders1)) {
                     shopOrderNo = cmMallShopOrders1.get(0).getShopOrderNo();
@@ -634,7 +634,7 @@ public class OrderServiceImpl implements OrderService {
                     cmMallShopOrder.setShopOrderNo(NoUtils.getCmShopOrderNo(cmMallOrder.getOrderNo(), 1));
                 }
                 //保存子订单信息到数据库
-                cmShopOrderMapper.insert(cmMallShopOrder);
+                cmMallShopOrderMapper.insert(cmMallShopOrder);
                 shopOrderIDs += ((shopOrderIDs.equals("") ? "" : ",") + cmMallShopOrder.getShopOrderID());
                 for (CmMallOrderProduct orderProduct : cmMallOrderProductList) {
                     orderProduct.setShopOrderID(cmMallShopOrder.getShopOrderID());
@@ -648,7 +648,7 @@ public class OrderServiceImpl implements OrderService {
             orderMapper.update(cmMallOrder);
 
             //获取地址信息
-            CmMallAddress cmMallAddress = addressMapper.findByAddressID(addressID);
+            CmMallAddress cmMallAddress = cmMallAddressMapper.findByAddressID(addressID);
             if (null != cmMallAddress) {
                 //保存地址信息
                 CmMallBpOrderUserInfo cmMallBpOrderUserInfo = new CmMallBpOrderUserInfo();
@@ -807,9 +807,9 @@ public class OrderServiceImpl implements OrderService {
             ShopOrderIDs = new String[]{order.getShopOrderIDs()};
         }
         for (String shopOrderID : ShopOrderIDs) {
-            CmMallShopOrder shopOrder = cmShopOrderMapper.get(Integer.valueOf(shopOrderID));
+            CmMallShopOrder shopOrder = cmMallShopOrderMapper.get(Integer.valueOf(shopOrderID));
             shopOrder.setDelFlag("1");
-            cmShopOrderMapper.update(shopOrder);
+            cmMallShopOrderMapper.update(shopOrder);
         }
 
         //逻辑删除收款记录

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

@@ -1,7 +1,7 @@
 package com.caimei.service.products;
 
 import com.caimei.entity.CmMallCart;
-import com.caimei.po.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallOrganizeProducts;
 
 public interface DetailsService {
     CmMallOrganizeProducts productDetails(Integer id, Integer userID);

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

@@ -2,7 +2,7 @@ package com.caimei.service.products;
 
 import com.caimei.entity.CmMallHospital;
 import com.caimei.entity.CmMallOrganize;
-import com.caimei.po.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallOrganizeProducts;
 
 import java.util.List;
 import java.util.Map;

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

@@ -3,7 +3,6 @@ package com.caimei.service.products.impl;
 import com.caimei.entity.*;
 import com.caimei.mapper.products.DetailsMapper;
 import com.caimei.mapper.products.HomePageMapper;
-import com.caimei.po.*;
 import com.caimei.service.products.DetailsService;
 import com.caimei.utils.AppUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -2,7 +2,7 @@ package com.caimei.service.products.impl;
 
 import com.caimei.entity.*;
 import com.caimei.mapper.products.HomePageMapper;
-import com.caimei.po.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallOrganizeProducts;
 import com.caimei.service.products.HomePageService;
 import com.caimei.utils.AppUtils;
 import org.slf4j.Logger;

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

@@ -1,9 +1,9 @@
 package com.caimei.service.products.impl;
 
 import com.caimei.entity.CmMallCart;
-import com.caimei.po.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallOrganizeProducts;
 import com.caimei.entity.CmMallPage;
-import com.caimei.po.CmMallShop;
+import com.caimei.entity.CmMallShop;
 import com.caimei.mapper.products.HomePageMapper;
 import com.caimei.mapper.products.ShoppingMapper;
 import com.caimei.service.products.ShoppingService;

src/main/java/com/caimei/service/search/SearchService.java

@@ -0,0 +1,19 @@
+package com.caimei.service.search;
+
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallProductLadderPrice;
+import com.caimei.entity.CmMallProductSearchHistory;
+
+import java.util.List;
+
+public interface SearchService {
+    List<CmMallOrganizeProducts> searchProduct(Integer organizeID, String searchWord);
+
+    void deleteProductRecord(Integer organizeID, String openID);
+
+    void saveProductRecord(Integer organizeID, String searchWord, String openID);
+
+    List<CmMallProductSearchHistory> findProductRecord(Integer organizeID, String openID);
+
+    CmMallProductLadderPrice findLadderPrice(Integer id);
+}

src/main/java/com/caimei/service/search/impl/SearchServiceImpl.java

@@ -0,0 +1,50 @@
+package com.caimei.service.search.impl;
+
+import com.caimei.entity.CmMallOrganizeProducts;
+import com.caimei.entity.CmMallProductLadderPrice;
+import com.caimei.entity.CmMallProductSearchHistory;
+import com.caimei.mapper.search.SearchMapper;
+import com.caimei.service.search.SearchService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class SearchServiceImpl implements SearchService {
+    @Autowired
+    private SearchMapper searchMapper;
+
+    @Override
+    public List<CmMallOrganizeProducts> searchProduct(Integer organizeID, String searchWord) {
+        List<CmMallOrganizeProducts> productsList = searchMapper.searchProduct(organizeID, searchWord);
+        return productsList;
+    }
+
+    @Override
+    public void deleteProductRecord(Integer organizeID, String openID) {
+        searchMapper.deleteProductRecord(organizeID, openID);
+    }
+
+    @Override
+    public void saveProductRecord(Integer organizeID, String searchWord, String openID) {
+        CmMallProductSearchHistory productSearchHistory = new CmMallProductSearchHistory();
+        productSearchHistory.setOpenID(openID);
+        productSearchHistory.setDelFlag("0");
+        productSearchHistory.setOrganizeID(organizeID);
+        productSearchHistory.setSearchDate(new Date());
+        productSearchHistory.setSearchWord(searchWord);
+        searchMapper.saveProductRecord(productSearchHistory);
+    }
+
+    @Override
+    public List<CmMallProductSearchHistory> findProductRecord(Integer organizeID, String openID) {
+        return searchMapper.findProductRecord(organizeID, openID);
+    }
+
+    @Override
+    public CmMallProductLadderPrice findLadderPrice(Integer id) {
+        return searchMapper.findLadderPrice(id);
+    }
+}

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

@@ -24,9 +24,9 @@ spring:
 #整合mybatis
 mybatis:
   #加载Mybatis映射文件
-  mapper-locations: classpath:mapper/*Mapper.xml,classpath*:mybatis/**/*.xml
+  mapper-locations: classpath:mapper/*Mapper.xml
   #pojo别名扫描包
-  type-aliases-package: com.caimei.entity,com.caimei.po
+  type-aliases-package: com.caimei.entity
 
 #分页配置
 pagehelper:

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.cmMallUser.AddressMapper">
+<mapper namespace="com.caimei.mapper.user.CmMallAddressMapper">
    
    <sql id="aColumns">
    		a.addressID,

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

src/main/resources/mapper/UserMapper.xml → src/main/resources/mapper/CmMallUserMapper.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.cmMallUser.UserMapper" >
+<mapper namespace="com.caimei.mapper.user.CmMallUserMapper" >
 
 	<select id="findUserById" resultType="com.caimei.entity.CmMallUser">
 		SELECT * FROM cmMallUser WHERE userID = #{userId}

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.po.CmMallOrganizeProducts">
+    <select id="findProduct" parameterType="int" resultType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
           *
         FROM
@@ -13,7 +13,7 @@
           AND delFlag = '0'
     </select>
 
-    <select id="cmMallProduct" resultType="com.caimei.po.CmMallProduct" parameterType="int">
+    <select id="cmMallProduct" 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.po.CmMallProductImage">
+    <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.po.CmMallProductDetailInfo" 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.po.CmMallShop">
+    <select id="findShop" parameterType="int" resultType="com.caimei.entity.CmMallShop">
         SELECT
           *
         FROM

src/main/resources/mapper/HomePageMapper.xml

@@ -19,7 +19,7 @@
           id DESC
     </select>
 
-    <select id="findProducts" resultType="com.caimei.po.CmMallOrganizeProducts" parameterType="int">
+    <select id="findProducts" resultType="com.caimei.entity.CmMallOrganizeProducts" parameterType="int">
         SELECT
           p.mainImage,
           p.name,
@@ -61,8 +61,8 @@
           ) a
     </select>
 
-    <select id="classify" resultType="com.caimei.po.CmMallOrganizeProducts"
-            parameterType="com.caimei.po.CmMallOrganizeProducts">
+    <select id="classify" resultType="com.caimei.entity.CmMallOrganizeProducts"
+            parameterType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
           cmop.*,
           p.mainImage,
@@ -82,7 +82,7 @@
           cmop.id DESC
     </select>
 
-    <select id="preferred" parameterType="int" resultType="com.caimei.po.CmMallOrganizeProducts">
+    <select id="preferred" parameterType="int" resultType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
         cmop.*,
         p.mainImage,

src/main/resources/mapper/OrderMapper.xml

@@ -198,7 +198,7 @@
           )
     </insert>
 
-    <select id="findShop" resultType="com.caimei.po.CmMallShop">
+    <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.po.CmMallOrganizeProducts">
+    <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.po.CmMallOrganizeProducts">
+    <select id="findCommodity" resultType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
           cmop.*,
           p.mainImage,
@@ -414,7 +414,7 @@
           AND expiredTime > NOW()
     </select>
 
-    <select id="oftenPurchase" resultType="com.caimei.po.CmMallOrganizeProducts">
+    <select id="oftenPurchase" resultType="com.caimei.entity.CmMallOrganizeProducts">
         SELECT
           cmop.*,
           p.mainImage,

src/main/resources/mapper/OrganizeProductsMapper.xml

@@ -35,7 +35,7 @@
 		LEFT JOIN cm_mall_products_classify cmpc on cmpc.id = a.classifyID
 	</sql>
     
-	<select id="selectProductById" resultType="com.caimei.po.CmMallOrganizeProducts">
+	<select id="selectProductById" resultType="com.caimei.entity.CmMallOrganizeProducts">
 		SELECT 
 			<include refid="cmMallOrganizeProductsColumns"/>
 		FROM cm_mall_organize_products a
@@ -44,7 +44,7 @@
 	</select>
 
     <!--获取采美商品信息-->
-    <select id="selectCmProductById" resultType="com.caimei.po.CmMallProduct">
+    <select id="selectCmProductById" resultType="com.caimei.entity.CmMallProduct">
         SELECT
         a.*
         FROM cmMallProduct a

src/main/resources/mapper/SearchMapper.xml

@@ -0,0 +1,87 @@
+<?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.search.SearchMapper">
+    <select id="searchProduct" resultType="com.caimei.entity.CmMallOrganizeProducts">
+        SELECT
+          cmop.*,
+          p.mainImage,
+          p.name,
+          p.unit
+        FROM
+          cm_mall_organize_products cmop
+          LEFT JOIN product p ON cmop.productID = p.productID
+        WHERE
+          cmop.organizeID = 1
+          AND cmop.validFlag = '1'
+          AND cmop.delFlag = '0'
+          AND p.name LIKE CONCAT('%', #{searchWord}, '%')
+          AND p.productID IS NOT NULL
+    </select>
+
+    <delete id="deleteProductRecord">
+        DELETE FROM
+          cm_mall_product_search_history
+        WHERE
+          organizeID = #{organizeID}
+          AND openID = #{openID}
+          AND delFlag = '0'
+          AND id NOT IN (
+            SELECT
+              psh.id
+            FROM
+              (
+                SELECT
+                  id
+                FROM
+                  cm_mall_product_search_history
+                WHERE
+                  organizeID = #{organizeID}
+                  AND openID = #{openID}
+                  AND delFlag = '0'
+                ORDER BY
+                  searchDate DESC
+                LIMIT
+                  10
+              ) AS psh
+          )
+    </delete>
+
+    <insert id="saveProductRecord" parameterType="com.caimei.entity.CmMallProductSearchHistory">
+        INSERT INTO cm_mall_product_search_history (
+          organizeID, openID, searchWord, searchDate,
+          delFlag
+        )
+        VALUES
+          (
+            #{organizeID}, #{openID}, #{searchWord}, #{searchDate},
+            #{delFlag}
+          )
+    </insert>
+
+    <select id="findLadderPrice" resultType="com.caimei.entity.CmMallProductLadderPrice">
+        SELECT
+          *
+        FROM
+          cm_mall_product_ladder_price
+        WHERE
+          productId = #{id}
+          AND delFlag = '0'
+        ORDER BY
+          ladderNum DESC
+        LIMIT
+          1
+    </select>
+
+    <select id="findProductRecord" resultType="com.caimei.entity.CmMallProductSearchHistory">
+        SELECT
+          *
+        FROM
+          cm_mall_product_search_history
+        WHERE
+          organizeID = #{organizeID}
+          AND openID = #{openID}
+          AND delFlag = '0'
+    </select>
+</mapper>

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.po.CmMallShop" 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.po.CmMallOrganizeProducts" parameterType="int">
+    <select id="findAllProducts" resultType="com.caimei.entity.CmMallOrganizeProducts" parameterType="int">
         SELECT
           cmop.*,
           p.mainImage,