修改名词异常

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

@@ -16,7 +16,7 @@ public class CmMallBrand implements Serializable {
     private String delFlag;      //删除标记 0 否，其余是
     private String certificate;  //品牌证书
     private String certifiedPhoto;  //认证照片
-    private List<CmMallHospital> CmMallHospitals; //医院信息
+    private List<CmMallHospital> hospitals; //医院信息
     private Integer sort;  //排序值
     private String securityLink;   //防伪链接
 
@@ -132,12 +132,12 @@ public class CmMallBrand implements Serializable {
         this.delFlag = delFlag;
     }
 
-    public List<CmMallHospital> getCmMallHospitals() {
-        return CmMallHospitals;
+    public List<CmMallHospital> getHospitals() {
+        return hospitals;
     }
 
-    public void setCmMallHospitals(List<CmMallHospital> cmMallHospitals) {
-        this.CmMallHospitals = cmMallHospitals;
+    public void setHospitals(List<CmMallHospital> hospitals) {
+        this.hospitals = hospitals;
     }
 
     @Override
@@ -155,7 +155,7 @@ public class CmMallBrand implements Serializable {
                 ", delFlag='" + delFlag + '\'' +
                 ", certificate='" + certificate + '\'' +
                 ", certifiedPhoto='" + certifiedPhoto + '\'' +
-                ", CmMallHospitals=" + CmMallHospitals +
+                ", hospitals=" + hospitals +
                 '}';
     }
 }

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

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

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

@@ -25,7 +25,7 @@ public class CmMallHospital implements Serializable {
     private String introduction;        //医院简介
     private String delFlag;             //删除标记 0 否，其余是
     private String creationVip;         //是不是创始会员 1是的, 0不是的
-    private List<CmMallBrand> CmMallBrands;         //品牌
+    private List<CmMallBrand> brands;         //品牌
     private Integer sort;  //排序值
 
     public Integer getSort() {
@@ -204,12 +204,12 @@ public class CmMallHospital implements Serializable {
         this.creationVip = creationVip;
     }
 
-    public List<CmMallBrand> getCmMallBrands() {
-        return CmMallBrands;
+    public List<CmMallBrand> getBrands() {
+        return brands;
     }
 
-    public void setCmMallBrands(List<CmMallBrand> cmMallBrands) {
-        this.CmMallBrands = cmMallBrands;
+    public void setBrands(List<CmMallBrand> brands) {
+        this.brands = brands;
     }
 
     @Override
@@ -236,7 +236,7 @@ public class CmMallHospital implements Serializable {
                 ", introduction='" + introduction + '\'' +
                 ", delFlag='" + delFlag + '\'' +
                 ", creationVip='" + creationVip + '\'' +
-                ", CmMallBrands=" + CmMallBrands +
+                ", brands=" + brands +
                 '}';
     }
 }

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

@@ -22,8 +22,8 @@ public class CmMallLogisticsBatch implements Serializable {
     private String updateDate;    //更新时间
     private String deliveryTime;        // 发货时间
     private String receiptTime;        // 收货时间
-    private List<CmMallLogisticsRecord> cmMallLogisticsRecords;//该批次订单商品记录
-    private List<CmMallLogisticsInfo> cmMallLogisticsInfos;//该批次物流信息
+    private List<CmMallLogisticsRecord> cmLogisticsRecords;//该批次订单商品记录
+    private List<CmMallLogisticsInfo> logisticsInfos;//该批次物流信息
     private List<CmMallShopOrder> shopOrderList;
 
     public List<CmMallShopOrder> getShopOrderList() {
@@ -98,20 +98,20 @@ public class CmMallLogisticsBatch implements Serializable {
         this.receiptTime = receiptTime;
     }
 
-    public List<CmMallLogisticsRecord> getCmMallLogisticsRecords() {
-        return cmMallLogisticsRecords;
+    public List<CmMallLogisticsRecord> getCmLogisticsRecords() {
+        return cmLogisticsRecords;
     }
 
-    public void setCmMallLogisticsRecords(List<CmMallLogisticsRecord> cmMallLogisticsRecords) {
-        this.cmMallLogisticsRecords = cmMallLogisticsRecords;
+    public void setCmLogisticsRecords(List<CmMallLogisticsRecord> cmLogisticsRecords) {
+        this.cmLogisticsRecords = cmLogisticsRecords;
     }
 
-    public List<CmMallLogisticsInfo> getCmMallLogisticsInfos() {
-        return cmMallLogisticsInfos;
+    public List<CmMallLogisticsInfo> getLogisticsInfos() {
+        return logisticsInfos;
     }
 
-    public void setCmMallLogisticsInfos(List<CmMallLogisticsInfo> cmMallLogisticsInfos) {
-        this.cmMallLogisticsInfos = cmMallLogisticsInfos;
+    public void setLogisticsInfos(List<CmMallLogisticsInfo> logisticsInfos) {
+        this.logisticsInfos = logisticsInfos;
     }
 
     public String getUpdateDate() {

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

@@ -36,7 +36,7 @@ public class CmMallLogisticsInfo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date deliveryTime; //发货时间
 
-    private List<CmMallRouter> cmMallRouters = new ArrayList<>();//此对象使用在转换info格式提供前端使用。JSONArray.parseArray(info, CmMallRouter.class)
+    private List<CmMallRouter> routers = new ArrayList<>();//此对象使用在转换info格式提供前端使用。JSONArray.parseArray(info, CmMallRouter.class)
     private List<CmMallLogisticsRecord> logisticsRecordList;    //物流批次
 
     public List<CmMallLogisticsRecord> getLogisticsRecordList() {
@@ -166,12 +166,12 @@ public class CmMallLogisticsInfo implements Serializable {
         this.remarks = remarks;
     }
 
-    public List<CmMallRouter> getCmMallRouters() {
-        return cmMallRouters;
+    public List<CmMallRouter> getRouters() {
+        return routers;
     }
 
-    public void setCmMallRouters(List<CmMallRouter> cmMallRouters) {
-        this.cmMallRouters = cmMallRouters;
+    public void setRouters(List<CmMallRouter> routers) {
+        this.routers = routers;
     }
 
     public Date getDeliveryTime() {

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

@@ -10,7 +10,7 @@ public class CmMallProvince implements Serializable {
     private String validflag;   //是否可用，1可用
     private Float deliveryfee;  //运费
     private Float freemintotalprice;  //最低包邮金额
-    private List<CmMallCity> cmMallCities;    //下面的市
+    private List<CmMallCity> citys;    //下面的市
 
     public Long getProvinceid() {
         return provinceid;
@@ -52,11 +52,11 @@ public class CmMallProvince implements Serializable {
         this.freemintotalprice = freemintotalprice;
     }
 
-    public List<CmMallCity> getCmMallCities() {
-        return cmMallCities;
+    public List<CmMallCity> getCitys() {
+        return citys;
     }
 
-    public void setCmMallCities(List<CmMallCity> cmMallCities) {
-        this.cmMallCities = cmMallCities;
+    public void setCitys(List<CmMallCity> citys) {
+        this.citys = citys;
     }
 }

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

@@ -57,11 +57,11 @@ public class CmMallShopOrder implements Serializable {
     private Integer outStoreNum;//已经发货的商品数量
     private Integer outStoreTimes;//第几批发货  default 0
     private Integer returnGoodsStatus;
-    private List<CmMallOrderProduct> cmMallOrderProducts; //订单商品信息
+    private List<CmMallOrderProduct> cmOrderProducts; //订单商品信息
     private CmMallUserInvoiceInfo orderInvoice;//订单发票信息
-    private List<CmMallLogisticsInfo> cmMallLogisticsInfos;//订单快递信息
-    private List<CmMallLogisticsBatch> cmMallLogisticsBatches;//物流批次信息
-    private List<CmMallLogisticsRecord> cmMallLogisticsRecords; //发货物流记录
+    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,13 +427,7 @@ public class CmMallShopOrder implements Serializable {
         this.shopName = shopName;
     }
 
-    public List<CmMallOrderProduct> getCmMallOrderProducts() {
-        return cmMallOrderProducts;
-    }
 
-    public void setCmMallOrderProducts(List<CmMallOrderProduct> cmMallOrderProducts) {
-        this.cmMallOrderProducts = cmMallOrderProducts;
-    }
 
     public CmMallUserInvoiceInfo getOrderInvoice() {
         return orderInvoice;
@@ -443,21 +437,6 @@ public class CmMallShopOrder implements Serializable {
         this.orderInvoice = orderInvoice;
     }
 
-    public List<CmMallLogisticsInfo> getCmMallLogisticsInfos() {
-        return cmMallLogisticsInfos;
-    }
-
-    public void setCmMallLogisticsInfos(List<CmMallLogisticsInfo> cmMallLogisticsInfos) {
-        this.cmMallLogisticsInfos = cmMallLogisticsInfos;
-    }
-
-    public List<CmMallLogisticsBatch> getCmMallLogisticsBatches() {
-        return cmMallLogisticsBatches;
-    }
-
-    public void setCmMallLogisticsBatches(List<CmMallLogisticsBatch> cmMallLogisticsBatches) {
-        this.cmMallLogisticsBatches = cmMallLogisticsBatches;
-    }
 
     public String getPayStatus() {
         return payStatus;
@@ -523,12 +502,36 @@ public class CmMallShopOrder implements Serializable {
         this.shopOtherFee = shopOtherFee;
     }
 
-    public List<CmMallLogisticsRecord> getCmMallLogisticsRecords() {
-        return cmMallLogisticsRecords;
+    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 setCmMallLogisticsRecords(List<CmMallLogisticsRecord> cmMallLogisticsRecords) {
-        this.cmMallLogisticsRecords = cmMallLogisticsRecords;
+    public void setCmLogisticsRecords(List<CmMallLogisticsRecord> cmLogisticsRecords) {
+        this.cmLogisticsRecords = cmLogisticsRecords;
     }
 
     public Integer getClubID() {

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

@@ -245,7 +245,7 @@ public class OrderServiceImpl implements OrderService {
             for (CmMallOrderProduct orderProduct : orderProductList) {
                 orderProduct.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
             }
-            shopOrder.setCmMallOrderProducts(orderProductList);
+            shopOrder.setCmOrderProducts(orderProductList);
             shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
         }
         //发票信息
@@ -724,16 +724,16 @@ public class OrderServiceImpl implements OrderService {
                 for (CmMallLogisticsRecord logisticsRecord : logisticsRecordList) {
                     logisticsRecord.setImage(AppUtils.getImageURL("product", logisticsRecord.getImage(), 0, domain));
                 }
-                shopOrder.setCmMallLogisticsRecords(logisticsRecordList);
+                shopOrder.setCmLogisticsRecords(logisticsRecordList);
                 shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
             }
             //物流信息
             List<CmMallLogisticsInfo> cmMallLogisticsInfoList = orderMapper.findLogisticsInfo(batch.getId());
             for (CmMallLogisticsInfo cmMallLogisticsInfo : cmMallLogisticsInfoList) {
                 List<CmMallRouter> cmMallRouters = JSONArray.parseArray(cmMallLogisticsInfo.getInfo(), CmMallRouter.class);
-                cmMallLogisticsInfo.setCmMallRouters(cmMallRouters);
+                cmMallLogisticsInfo.setRouters(cmMallRouters);
             }
-            batch.setCmMallLogisticsInfos(cmMallLogisticsInfoList);
+            batch.setLogisticsInfos(cmMallLogisticsInfoList);
             batch.setShopOrderList(shopOrderList);
         }
         return batchList;
@@ -759,7 +759,7 @@ public class OrderServiceImpl implements OrderService {
                 for (CmMallOrderProduct orderProduct : orderProductList) {
                     orderProduct.setProductImage(AppUtils.getImageURL("product", orderProduct.getProductImage(), 0, domain));
                 }
-                shopOrder.setCmMallOrderProducts(orderProductList);
+                shopOrder.setCmOrderProducts(orderProductList);
                 shopOrder.setShopLogo(AppUtils.getImageURL("shopLogo", shopOrder.getShopLogo(), 0, domain));
             }
             order.setShopOrderList(shopOrderList);

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

@@ -91,7 +91,7 @@ public class HomePageServiceImpl implements HomePageService {
         List<CmMallHospital> member = homePageMapper.member();
         for (CmMallHospital CmMallHospital : member) {
             List<CmMallBrand> CmMallBrands = homePageMapper.findId(CmMallHospital.getId());
-            CmMallHospital.setCmMallBrands(CmMallBrands);
+            CmMallHospital.setBrands(CmMallBrands);
         }
         return member;
     }

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

@@ -88,11 +88,11 @@ public class PersonalServiceImpl implements PersonalService {
         List<CmMallProvince> list = personalMapper.findAllProvince();
         for (CmMallProvince cmMallProvince : list) {
             List<CmMallCity> cmMallCityList = personalMapper.findAllCity(cmMallProvince.getProvinceid());
-            cmMallProvince.setCmMallCities(cmMallCityList);
+            cmMallProvince.setCitys(cmMallCityList);
             if (cmMallCityList != null && cmMallCityList.size() > 0) {
                 for (CmMallCity cmMallCity : cmMallCityList) {
                     List<CmMallTown> cmMallTownList = personalMapper.findAllTown(cmMallCity.getCityid());
-                    cmMallCity.setCmMallTowns(cmMallTownList);
+                    cmMallCity.setTowns(cmMallTownList);
                 }
             }
         }

src/main/resources/mapper/BpUserInfoMapper.xml

@@ -14,10 +14,10 @@
         a.phone,
         a.postalCode,
         a.townId,
-        a.cmMallProvince,
-        a.cmMallCity,
+        a.province,
+        a.city,
         a.town,
-        a.cmMallAddress
+        a.address
         FROM bp_order_userinfo a
         WHERE a.orderId = #{orderId}
     </select>
@@ -33,10 +33,10 @@
         phone = #{phone},
         postalCode = #{postalCode},
         townId = #{townId},
-        cmMallProvince = #{cmMallProvince},
-        cmMallCity = #{cmMallCity},
+        province = #{province},
+        city = #{city},
         town = #{town},
-        cmMallAddress = #{cmMallAddress}
+        address = #{address}
         WHERE id = #{id}
     </update>
 
@@ -51,10 +51,10 @@
         phone,
         postalCode,
         townId,
-        cmMallProvince,
-        cmMallCity,
+        province,
+        city,
         town,
-        cmMallAddress
+        address
         ) VALUES (
         #{orderId},
         #{clubId},
@@ -65,10 +65,10 @@
         #{phone},
         #{postalCode},
         #{townId},
-        #{cmMallProvince},
-        #{cmMallCity},
+        #{province},
+        #{city},
         #{town},
-        #{cmMallAddress}
+        #{address}
         )
     </insert>
 

src/main/resources/mapper/CmMallAddressMapper.xml

@@ -7,7 +7,7 @@
    		a.userID,
    		a.shouHuoRen,
    		a.townID,
-   		a.cmMallAddress AS "addressDetail",
+   		a.address AS "addressDetail",
    		a.postalCode,
    		a.phone,
    		a.mobile,
@@ -15,21 +15,21 @@
    		c.cityID,
    		p.provinceID,
    		t.name AS "town",
-   		c.name AS "cmMallCity",
-   		p.name AS "cmMallProvince"
+   		c.name AS "city",
+   		p.name AS "province"
 	</sql>
 	
 	 <sql id="aJoins">
 	 	LEFT JOIN town t ON t.townID=a.townID
-	 	LEFT JOIN cmMallCity c ON c.cityID=t.cityID
-	 	LEFT JOIN cmMallProvince p ON p.provinceID=c.provinceID
+	 	LEFT JOIN city c ON c.cityID=t.cityID
+	 	LEFT JOIN province p ON p.provinceID=c.provinceID
 	 </sql>
 
 
 	<select id="findByAddressID" resultType="com.caimei.entity.CmMallAddress">
 		SELECT
 		<include refid="aColumns"/>
-		FROM cmMallAddress a
+		FROM address a
 		<include refid="aJoins"/>
 		WHERE a.addressID=#{addressID}
 	</select>
@@ -38,7 +38,7 @@
 	<select id="get" resultType="com.caimei.entity.CmMallAddress">
 		SELECT 
 			 <include refid="aColumns"/>
-		FROM cmMallAddress a
+		FROM address a
 		<include refid="aJoins"/>
 		WHERE a.addressID=#{addressID}
   	</select>
@@ -46,7 +46,7 @@
 	<select id="findByUserId" resultType="com.caimei.entity.CmMallAddress">
 		SELECT 
 			 <include refid="aColumns"/>
-		FROM cmMallAddress a
+		FROM address a
 		<include refid="aJoins"/>
 		WHERE a.userID=#{userID}
   	</select>
@@ -54,44 +54,44 @@
 	<select id="findByUserIdByAddress" resultType="com.caimei.entity.CmMallAddress">
 		SELECT
 		<include refid="aColumns"/>
-		FROM cmMallAddress a
+		FROM address a
 		<include refid="aJoins"/>
 		WHERE a.userID=#{userID}
 	</select>
   	
   	<update id="updateIsDefault">
-  		UPDATE cmMallAddress SET defaultFlag=1 WHERE addressID=#{addressID}
+  		UPDATE address SET defaultFlag=1 WHERE addressID=#{addressID}
   	</update>
   	
   	<update id="updateNoDefault">
-  		UPDATE cmMallAddress SET defaultFlag=0 WHERE userID=#{userID}
+  		UPDATE address SET defaultFlag=0 WHERE userID=#{userID}
   	</update>
 
   	<update id="updateUser">
-  		UPDATE cmMallAddress SET userID=#{newUserID} WHERE userID=#{oldUserId}
+  		UPDATE address SET userID=#{newUserID} WHERE userID=#{oldUserId}
   	</update>
 
   	<delete id="delete">
-  		DELETE FROM cmMallAddress WHERE addressID=#{addressID}
+  		DELETE FROM address WHERE addressID=#{addressID}
   	</delete>
   	
   	<update id="update" parameterType="com.caimei.entity.CmMallAddress">
-  		UPDATE cmMallAddress SET
+  		UPDATE address SET
   			shouHuoRen=#{shouHuoRen},
   			mobile=#{mobile},
   			postalCode=#{postalCode},
   			townID=#{townID},
-  			cmMallAddress=#{addressDetail},
+  			address=#{addressDetail},
   			phone=#{phone}
   		WHERE addressID = #{addressID}
   	</update>
   	
   	<insert id="insert" parameterType="com.caimei.entity.CmMallAddress" keyProperty="addressID" useGeneratedKeys="true">
-  		INSERT INTO cmMallAddress(
+  		INSERT INTO address(
   				userID,
   				shouHuoRen,
   				townID,
-  				cmMallAddress,
+  				address,
   				postalCode,
   				mobile,
   				phone

src/main/resources/mapper/CmMallShopOrderMapper.xml

@@ -58,7 +58,7 @@
 		a.splitFlag AS "splitFlag",
 		a.payStatus AS "payStatus",
 		a.sendOutStatus AS "sendOutStatus",
-		(SELECT name FROM cmMallShop s WHERE s.shopID = a.shopID) AS "shopName",
+		(SELECT name FROM shop s WHERE s.shopID = a.shopID) AS "shopName",
 		(SELECT IFNULL(SUM(totalAddedValueTax),0) FROM cm_order_product cop WHERE cop.shopOrderID = a.shopOrderID) AS "totalAddedValueTax"
 	</sql>
 	

src/main/resources/mapper/CmMallUserMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.caimei.mapper.user.CmMallUserMapper" >
 
 	<select id="findUserById" resultType="com.caimei.entity.CmMallUser">
-		SELECT * FROM cmMallUser WHERE userID = #{userId}
+		SELECT * FROM user WHERE userID = #{userId}
 	</select>
 
 	<update id="updateBalanceRecord">
@@ -40,10 +40,10 @@
 	</insert>
 
 	<update id="updateAbleUserMoney" parameterType="com.caimei.entity.CmMallUser">
-		UPDATE cmMallUser SET ableUserMoney=#{ableUserMoney} WHERE userID=#{userID}
+		UPDATE user SET ableUserMoney=#{ableUserMoney} WHERE userID=#{userID}
 	</update>
 
 	<update id="updateUserMoney" parameterType="com.caimei.entity.CmMallUser">
-		UPDATE cmMallUser SET userMoney=#{userMoney} WHERE userID=#{userID}
+		UPDATE user SET userMoney=#{userMoney} WHERE userID=#{userID}
 	</update>
 </mapper>

src/main/resources/mapper/DetailsMapper.xml

@@ -18,7 +18,7 @@
           p.*,
           cb.name AS brandName
         FROM
-          cmMallProduct p
+          product p
           LEFT JOIN cm_brand cb ON p.brandID = cb.id
         WHERE
           productID = #{productID}
@@ -48,7 +48,7 @@
         SELECT
           *
         FROM
-          cmMallShop
+          shop
         WHERE
           shopID = #{shopID}
     </select>

src/main/resources/mapper/HomePageMapper.xml

@@ -28,7 +28,7 @@
           cop.organizeID
         FROM
           cm_mall_organize_products cop
-          LEFT JOIN cmMallProduct p ON cop.productID = p.productID
+          LEFT JOIN product p ON cop.productID = p.productID
         WHERE
           cop.organizeID = #{organizeID}
           AND cop.commonlyProduct = '1'
@@ -70,7 +70,7 @@
           p.unit
         FROM
           cm_mall_organize_products cmop
-          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
+          LEFT JOIN product p ON cmop.productID = p.productID
         WHERE
           cmop.classifyID = #{classifyID}
           AND cmop.organizeID= #{organizeID}
@@ -90,7 +90,7 @@
         p.unit
         FROM
         cm_mall_organize_products cmop
-        LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
+        LEFT JOIN product p ON cmop.productID = p.productID
         <where>
             <if test="preferredProduct != null and preferredProduct != ''">
                 AND cmop.preferredProduct = '1'

src/main/resources/mapper/OrderMapper.xml

@@ -203,8 +203,8 @@
            s.*
         FROM
           cm_mall_organize_products cmop
-          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
-          LEFT JOIN cmMallShop s ON p.shopID = s.shopID
+          LEFT JOIN product p ON cmop.productID = p.productID
+          LEFT JOIN shop s ON p.shopID = s.shopID
           LEFT JOIN cm_mall_cart cmc ON cmop.id = cmc.productID
         WHERE
           cmop.id IN
@@ -228,7 +228,7 @@
         FROM
           cm_mall_organize_products cmop
           LEFT JOIN cm_mall_cart cmc ON cmop.id = cmc.productID
-          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
+          LEFT JOIN product p ON cmop.productID = p.productID
         WHERE
           p.shopID = #{shopID}
           AND cmc.userID = #{userId}
@@ -249,7 +249,7 @@
           p.unit
         FROM
           cm_mall_organize_products cmop
-          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
+          LEFT JOIN product p ON cmop.productID = p.productID
         WHERE
           p.shopID = #{shopID}
           AND cmop.id = #{productIDs}
@@ -281,7 +281,7 @@
           s.logo AS shopLogo
         FROM
           cm_shop_order cso
-          LEFT JOIN cmMallShop s ON cso.shopID = s.shopID
+          LEFT JOIN shop s ON cso.shopID = s.shopID
         WHERE
           cso.shopOrderID IN
           <foreach collection="array" item="shopOrderID" index="index" open="(" separator="," close=")">
@@ -293,10 +293,10 @@
     <select id="findOrderProduct" resultType="com.caimei.entity.CmMallOrderProduct" parameterType="int">
         SELECT
           cop.*,
-          p.mainImage AS cmMallProductImage
+          p.mainImage AS productImage
         FROM
           cm_order_product cop
-          LEFT JOIN cmMallProduct p ON cop.productID = p.productID
+          LEFT JOIN product p ON cop.productID = p.productID
         WHERE
           shopOrderID = #{shopOrderID}
     </select>
@@ -424,7 +424,7 @@
           cm_order co
           LEFT JOIN cm_order_product cop ON co.orderID = cop.orderID
           LEFT JOIN cm_mall_organize_products cmop ON cmop.id = cop.organizeProductID
-          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
+          LEFT JOIN product p ON cmop.productID = p.productID
         WHERE
           co.delFlag = '0'
           AND co.status NOT IN(6, 7)

src/main/resources/mapper/OrderProductMapper.xml

@@ -56,7 +56,7 @@
 			a.preferential AS "preferential",
 			a.actPreferential AS "actPreferential",
 			a.actType AS "actType",
-			a.cmMallProductImage AS cmMallProductImage,
+			a.productImage AS productImage,
 			a.productUnit AS productUnit
 		</sql>
 
@@ -191,7 +191,7 @@
 			preferential,
 			actPreferential,
 			actType,
-			cmMallProductImage,
+			productImage,
 			productUnit
 			) VALUES (
 			#{orderNo},
@@ -246,7 +246,7 @@
 			#{preferential},
 			#{actPreferential},
 			#{actType},
-			#{cmMallProductImage},
+			#{productImage},
 			#{productUnit}
 			)
 		</insert>
@@ -305,7 +305,7 @@
 			preferential = #{preferential},
 			actPreferential = #{actPreferential},
 			actType = #{actType},
-			cmMallProductImage = #{cmMallProductImage},
+			productImage = #{productImage},
 			productUnit = #{productUnit}
 			WHERE orderProductID = #{orderProductID}
 		</update>

src/main/resources/mapper/OrganizeProductsMapper.xml

@@ -30,8 +30,8 @@
 	</sql>
 	
 	<sql id="cmMallOrganizeProductsJoins">
-		LEFT JOIN cmMallProduct p on p.productID = a.productID
-		LEFT JOIN cmMallShop s on s.shopID = p.shopID
+		LEFT JOIN product p on p.productID = a.productID
+		LEFT JOIN shop s on s.shopID = p.shopID
 		LEFT JOIN cm_mall_products_classify cmpc on cmpc.id = a.classifyID
 	</sql>
     
@@ -47,7 +47,7 @@
     <select id="selectCmProductById" resultType="com.caimei.entity.CmMallProduct">
         SELECT
         a.*
-        FROM cmMallProduct a
+        FROM product a
         WHERE a.productID = #{productID}
     </select>
 
@@ -107,7 +107,7 @@
         preferential,
         actPreferential,
         actType,
-        cmMallProductImage,
+        productImage,
         productUnit
         ) VALUES (
         #{orderNo},
@@ -164,7 +164,7 @@
         #{preferential},
         #{actPreferential},
         #{actType},
-        #{cmMallProductImage},
+        #{productImage},
         #{productUnit}
         )
     </insert>
@@ -224,7 +224,7 @@
 			preferential = #{preferential},
 			actPreferential = #{actPreferential},
 			actType = #{actType},
-			cmMallProductImage = #{cmMallProductImage},
+			productImage = #{productImage},
 			productUnit = #{productUnit}
 			WHERE orderProductID = #{orderProductID}
 		</update>

src/main/resources/mapper/PersonalMapper.xml

@@ -15,7 +15,7 @@
         FROM
           cm_mall_operation_user cou
           LEFT JOIN USER u ON u.userID = cou.userID
-          LEFT JOIN cmMallClub c ON u.clubID = c.clubID
+          LEFT JOIN club c ON u.clubID = c.clubID
           LEFT JOIN cm_mall_organize cuo ON cuo.id=cou.userOrganizeID
         WHERE
           cou.openid = #{openid}
@@ -45,11 +45,11 @@
     </select>
 
     <select id="findAllProvince" resultType="com.caimei.entity.CmMallProvince">
-        SELECT * FROM cmMallProvince WHERE validFlag = '1'
+        SELECT * FROM province WHERE validFlag = '1'
     </select>
 
     <select id="findAllCity" resultType="com.caimei.entity.CmMallCity">
-        SELECT * FROM cmMallCity WHERE provinceID = #{provinceID} AND validFlag = '1'
+        SELECT * FROM city WHERE provinceID = #{provinceID} AND validFlag = '1'
     </select>
 
     <select id="findAllTown" resultType="com.caimei.entity.CmMallTown">
@@ -62,13 +62,13 @@
           userID,
           shouHuoRen,
           townID,
-          cmMallAddress AS addressDetail,
+          address AS addressDetail,
           postalCode,
           phone,
           mobile,
           defaultFlag
         FROM
-          cmMallAddress
+          address
         WHERE
           userID = #{userID}
         ORDER BY
@@ -78,13 +78,13 @@
 
     <select id="findCantonal" resultType="com.caimei.entity.CmMallAddress">
         SELECT
-          p.name AS cmMallProvince,
-          c.name AS cmMallCity,
+          p.name AS province,
+          c.name AS city,
           t.name AS town
         FROM
           town t
-          LEFT JOIN cmMallCity c ON t.cityID = c.cityID
-          LEFT JOIN cmMallProvince p ON p.provinceID = c.provinceID
+          LEFT JOIN city c ON t.cityID = c.cityID
+          LEFT JOIN province p ON p.provinceID = c.provinceID
         WHERE
           t.townID = #{townID}
           AND t.validFlag = '1'
@@ -93,8 +93,8 @@
     </select>
 
     <insert id="saveAddress" parameterType="com.caimei.entity.CmMallAddress">
-        INSERT INTO cmMallAddress (
-          userID, shouHuoRen, townID, cmMallAddress,
+        INSERT INTO address (
+          userID, shouHuoRen, townID, address,
           mobile, defaultFlag
         )
         VALUES
@@ -106,11 +106,11 @@
 
     <update id="updateAddress" parameterType="com.caimei.entity.CmMallAddress">
         UPDATE
-          cmMallAddress
+          address
         SET
           shouHuoRen =#{shouHuoRen},
           townID = #{townID},
-          cmMallAddress = #{addressDetail},
+          address = #{addressDetail},
           mobile = #{mobile},
           defaultFlag = #{defaultFlag}
         WHERE
@@ -118,7 +118,7 @@
     </update>
 
     <delete id="deleteAddress" parameterType="int">
-        DELETE FROM cmMallAddress WHERE addressID = #{addressID}
+        DELETE FROM address WHERE addressID = #{addressID}
     </delete>
 
     <select id="findDefaultAddress" resultType="com.caimei.entity.CmMallAddress">
@@ -127,13 +127,13 @@
           userID,
           shouHuoRen,
           townID,
-          cmMallAddress AS addressDetail,
+          address AS addressDetail,
           postalCode,
           phone,
           mobile,
           defaultFlag
         FROM
-          cmMallAddress
+          address
         WHERE
           userID = #{userID}
           AND defaultFlag = '1'

src/main/resources/mapper/ShoppingMapper.xml

@@ -9,8 +9,8 @@
         FROM
           cm_mall_cart cmc
           LEFT JOIN cm_mall_organize_products cmop ON cmop.id = cmc.productID
-          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
-          LEFT JOIN cmMallShop s ON p.shopID = s.shopID
+          LEFT JOIN product p ON cmop.productID = p.productID
+          LEFT JOIN shop s ON p.shopID = s.shopID
         WHERE
           cmc.userID = #{userID}
           AND cmc.delFlag = '0'
@@ -30,7 +30,7 @@
         FROM
           cm_mall_cart cmc
           LEFT JOIN cm_mall_organize_products cmop ON cmop.id = cmc.productID
-          LEFT JOIN cmMallProduct p ON cmop.productID = p.productID
+          LEFT JOIN product p ON cmop.productID = p.productID
         WHERE
           p.shopID = #{shopID}
           AND cmc.userID = #{userID}