数据库字段整理

src/main/java/com/caimei365/commodity/model/search/ProductListVo.java

@@ -64,10 +64,10 @@ public class ProductListVo implements Serializable {
      * 搜索关键词searchKey
      */
     private String keyword;
-    /**
-     * 美博会商品活动状态
-     */
-    private Integer beautyActFlag;
+//    /**
+//     * 美博会商品活动状态
+//     */
+//    private Integer beautyActFlag;
     /**
      * 商品可见度： 3:所有人可见，2:普通机构可见，1:会员机构可见
      */

src/main/java/com/caimei365/commodity/model/vo/ProductItemVo.java

@@ -67,10 +67,10 @@ public class ProductItemVo implements Serializable {
      * 搜索关键词searchKey
      */
     private String keyword;
-    /**
-     * 美博会商品活动状态
-     */
-    private Integer beautyActFlag;
+//    /**
+//     * 美博会商品活动状态
+//     */
+//    private Integer beautyActFlag;
     /**
      * 商品原价
      */

src/main/java/com/caimei365/commodity/utils/Json2PojoUtil.java

@@ -50,8 +50,8 @@ public class Json2PojoUtil {
             product.setBrandName(json.getString("p_brand_name"));
             /* 所属供应商Id，关联供应商表 */
             product.setShopId(json.getInt("p_supplier_id"));
-            /* 美博会商品活动状态 */
-            product.setBeautyActFlag(json.getInt("p_act_flag"));
+//            /* 美博会商品活动状态 */
+//            product.setBeautyActFlag(json.getInt("p_act_flag"));
             /* 品牌id*/
             product.setBrandId(json.getInt("p_brand_id"));
             productList.add(product);

src/main/resources/mapper/CouponMapper.xml

@@ -65,13 +65,12 @@
         p.mainImage AS image,
         p.unit,
         p.productCode AS CODE,
-        p.price1TextFlag AS priceFlag,
-        p.price1 AS price,
+        p.priceFlag,
+        p.price,
         p.costPrice,
         p.costCheckFlag,
         p.shopID AS shopId,
         p.searchKey AS keyword,
-        p.price8Text AS beautyActFlag,
         p.minBuyNumber AS minBuyNumber,
         p.maxBuyNumber AS maxBuyNumber,
         p.ladderPriceFlag,

src/main/resources/mapper/PageMapper.xml

@@ -123,11 +123,10 @@
             p.mainImage as image,
             p.unit,
             p.productCode as code,
-            p.price1TextFlag as priceFlag,
-            p.price1 as price,
+            p.priceFlag,
+            p.price,
             p.shopID as shopId,
             p.searchKey as keyword,
-            p.price8Text as beautyActFlag,
             p.minBuyNumber as minBuyNumber,
             p.maxBuyNumber as maxBuyNumber,
             p.ladderPriceFlag,
@@ -174,8 +173,8 @@
     <select id="getProductDetails" resultType="com.caimei365.commodity.model.vo.ProductDetailVo">
         select productID as productId, shopID as shopId,  name, aliasName, commodityType, mainImage, stock, invoiceType,
             bigTypeID as bigTypeId, smallTypeID as smallTypeId, tinyTypeID as tinyTypeId, searchKey, visibility,
-            brandID as brandId,  productType, tags, unit, normalPrice, price1 as price, includedTax, minBuyNumber,
-            productCategory, serviceNumber, taxPoint, supplierTaxPoint, price1TextFlag as priceFlag, actFlag, ladderPriceFlag,
+            brandID as brandId,  productType, tags, unit, normalPrice, price, includedTax, minBuyNumber,
+            productCategory, serviceNumber, taxPoint, supplierTaxPoint, priceFlag, actFlag, ladderPriceFlag,
             addTime, hasSkuFlag, sellNumber, sortIndex, featuredFlag, costCheckFlag, recommendType, machineType,
             productCode, updateTime, validFlag, searchKey, allAreaFlag, step, costPrice, provinceIds, qualificationImg,
             trainingMethod, trainingType ,trainingFee
@@ -191,13 +190,12 @@
             p.mainImage as image,
             p.unit,
             p.productCode as code,
-            p.price1TextFlag as priceFlag,
-            p.price1 as price,
+            p.priceFlag,
+            p.price,
             p.costPrice,
             p.costCheckFlag,
             p.shopID as shopId,
             p.searchKey as keyword,
-            p.price8Text as beautyActFlag,
             p.minBuyNumber as minBuyNumber,
             p.maxBuyNumber as maxBuyNumber,
             p.ladderPriceFlag,
@@ -503,11 +501,10 @@
             p.mainImage as image,
             p.unit,
             p.productCode as code,
-            p.price1TextFlag as priceFlag,
-            p.price1 as price,
+            p.priceFlag,
+            p.price,
             p.shopID as shopId,
             p.searchKey as keyword,
-            p.price8Text as beautyActFlag,
             p.minBuyNumber as minBuyNumber,
             p.maxBuyNumber as maxBuyNumber,
             p.ladderPriceFlag,

src/main/resources/mapper/PriceMapper.xml

@@ -8,10 +8,10 @@
         select
             p.productID as productId,
             p.actStatus,
-            p.price1 as price,
+            p.price,
             p.minBuyNumber,
             p.maxBuyNumber,
-            p.price1TextFlag as priceFlag,
+            p.priceFlag,
             p.ladderPriceFlag,
             p.normalPrice,
             p.costPrice,
@@ -34,10 +34,10 @@
         select
             p.productID as productId,
             p.actStatus,
-            p.price1 as price,
+            p.price,
             p.minBuyNumber,
             p.maxBuyNumber,
-            p.price1TextFlag as priceFlag,
+            p.priceFlag,
             p.ladderPriceFlag,
             p.normalPrice,
             p.costPrice,
@@ -89,7 +89,7 @@
         left join product p on p.productID = r.productId
         where r.productId = #{productId} and userId = #{userId}
         and ((p.costCheckFlag=1 and r.currentPrice <![CDATA[ >= ]]> p.costPrice) or p.costCheckFlag=2)
-        and p.price1 <![CDATA[ >= ]]> r.currentPrice
+        and p.price <![CDATA[ >= ]]> r.currentPrice
         and r.delFlag = 0
     </select>
     <select id="getTaxByProductId" resultType="com.caimei365.commodity.model.vo.TaxVo">

src/main/resources/mapper/PromotionsMapper.xml

@@ -51,7 +51,7 @@
                cpg.number  as number,
                0           as price,
                2           as productType,
-               p.price1    as originalPrice,
+               p.price    as originalPrice,
                p.unit      as unit,
                p.validFlag as validFlag,
                p.stock     as stock
@@ -96,9 +96,9 @@
         p.productID as productId,
         p.`name` as `name`,
         p.mainImage as image,
-        p.price1 as price,
+        p.price,
         p.unit as unit,
-        p.price1TextFlag as priceFlag,
+        p.priceFlag,
         IFNULL(p.visibility,3) as visibility
         from product p
         left join cm_promotions_product cpp on cpp.productId = p.productID

src/main/resources/mapper/SearchMapper.xml

@@ -291,11 +291,10 @@
         br.name as brandName,
         p.unit as unit,
         p.productCode as code,
-        p.price1TextFlag as priceFlag,
-        p.price1 as price,
+        p.priceFlag,
+        p.price,
         p.shopID as shopId,
-        p.searchKey as keyword,
-        IFNULL(p.price8Text,0) as beautyActFlag
+        p.searchKey as keyword
         from product p
         left join cm_brand as br on p.brandID = br.id
         where p.productCategory = 1
@@ -332,7 +331,7 @@
             <when test="sortField != null and sortField != ''">
                 <choose>
                     <when test="sortField == 'price'">
-                        order by p.price1
+                        order by p.price
                     </when>
                     <when test="sortField == 'sales'">
                         order by p.sellNumber

src/main/resources/mapper/SecondHandMapper.xml

@@ -22,12 +22,12 @@
     </insert>
     <insert id="insertProduct" keyColumn="productID" keyProperty="productId" parameterType="com.caimei365.commodity.model.po.ProductPo" useGeneratedKeys="true">
         insert into product (
-            brandId, name, price, price1, stock, aliasName, normalPrice, mainImage, productCategory, preferredFlag, shopId,
+            brandId, name, price, stock, aliasName, normalPrice, mainImage, productCategory, preferredFlag, shopId,
             sellNumber, costPrice, costCheckFlag, costProportional, hasSkuFlag, validFlag, ladderPriceFlag, sortIndex, featuredFlag, byFlag,
             step, actFlag, actStatus, freePostFlag, productType, machineType, includedTax, recommendType, invoiceType,
             visibility, addTime, updateTime, onlineTime, downlineTime
         ) values (
-            #{brandId}, #{name}, #{price}, #{price}, #{stock}, #{aliasName}, #{normalPrice}, #{mainImage}, #{productCategory},
+            #{brandId}, #{name}, #{price}, #{stock}, #{aliasName}, #{normalPrice}, #{mainImage}, #{productCategory},
             #{preferredFlag}, #{shopId}, #{sellNumber}, #{costPrice}, #{costCheckFlag}, #{costProportional}, #{hasSkuFlag}, #{validFlag},
             #{ladderPriceFlag}, #{sortIndex}, #{featuredFlag}, #{byFlag}, #{step}, #{actFlag}, #{actStatus},
             #{freePostFlag}, #{productType}, #{machineType}, #{includedTax}, #{recommendType}, #{invoiceType},
@@ -44,7 +44,7 @@
             p.actStatus,
             p.`name` as name,
             p.mainImage as image,
-            p.price1 as price,
+            p.price,
             p.brandID as brandId,
 	        IF(p.brandID != 161,cb.name ,cshd.brandName) as "brandName",
 	        cshd.sold as "sold",
@@ -81,7 +81,7 @@
             p.actStatus,
             p.`name` as name,
             p.mainImage as image,
-            p.price1 as price,
+            p.price,
             p.normalPrice,
             p.productType,
             p.stock,
@@ -129,7 +129,7 @@
             p.actStatus,
             p.`name` as name,
             p.mainImage as image,
-            p.price1 as price,
+            p.price,
             p.brandID as brandId,
 	        IF(p.brandID != 161,cb.name ,cshd.brandName) as "brandName",
 	        cshd.sold as "sold",
@@ -161,7 +161,7 @@
             p.actStatus,
             p.`name` as name,
             p.mainImage as image,
-            p.price1 as price,
+            p.price,
             p.brandID as brandId,
 	        IF(p.brandID != 161,cb.name ,cshd.brandName) as "brandName",
 	        cshd.sold as "sold",
@@ -192,7 +192,7 @@
         p.actStatus,
         p.`name` as name,
         p.mainImage as image,
-        p.price1 as price,
+        p.price,
         p.brandID as brandId,
         cb.name as "brandName"
         from product p

src/main/resources/mapper/SellerMapper.xml

@@ -9,11 +9,10 @@
                p.mainImage       as image,
                p.unit,
                p.productCode     as code,
-               p.price1TextFlag  as priceFlag,
-               p.price1          as price,
+               p.priceFlag,
+               p.price,
                p.shopID          as shopId,
                p.searchKey       as keyword,
-               p.price8Text      as beautyActFlag,
                p.minBuyNumber    as minBuyNumber,
                p.maxBuyNumber    as maxBuyNumber,
                p.ladderPriceFlag,
@@ -54,11 +53,10 @@
                p.mainImage       as image,
                p.unit,
                p.productCode     as code,
-               p.price1TextFlag  as priceFlag,
-               p.price1          as price,
+               p.priceFlag,
+               p.price,
                p.shopID          as shopId,
                p.searchKey       as keyword,
-               p.price8Text      as beautyActFlag,
                p.minBuyNumber    as minBuyNumber,
                p.maxBuyNumber    as maxBuyNumber,
                p.ladderPriceFlag,
@@ -101,11 +99,10 @@
         p.mainImage as image,
         p.unit,
         p.productCode as code,
-        p.price1TextFlag as priceFlag,
-        p.price1 as price,
+        p.priceFlag,
+        p.price,
         p.shopID as shopId,
         p.searchKey as keyword,
-        p.price8Text as beautyActFlag,
         p.minBuyNumber as minBuyNumber,
         p.maxBuyNumber as maxBuyNumber,
         p.ladderPriceFlag,

src/main/resources/mapper/ShopMapper.xml

@@ -4,7 +4,7 @@
     <insert id="insertProduct" keyColumn="productID" keyProperty="productId"  parameterType="com.caimei365.commodity.model.po.ProductPo" useGeneratedKeys="true">
         insert into product (
             shopID, name, aliasName, commodityType, bigTypeID, smallTypeID, tinyTypeID, mainImage,
-            brandID, productType, tags, unit, normalPrice, price, price1, includedTax, minBuyNumber, stock,
+            brandID, productType, tags, unit, normalPrice, price, includedTax, minBuyNumber, stock,
             <if test="productCategory != null and  productCategory != ''">
                 productCategory,
             </if>
@@ -36,7 +36,7 @@
                 recommendType,
             </if>
             <if test="priceFlag != null and  priceFlag != ''">
-                price1TextFlag,
+                priceFlag,
             </if>
             <if test="actFlag != null and  actFlag != ''">
                 actFlag,
@@ -86,7 +86,7 @@
             updateTime, validFlag
         ) values (
             #{shopId}, #{name}, #{aliasName}, #{commodityType}, #{bigTypeId}, #{smallTypeId}, #{tinyTypeId}, #{mainImage},
-            #{brandId}, #{productType}, #{tags}, #{unit}, #{normalPrice}, #{price}, #{price}, #{includedTax}, #{minBuyNumber}, #{stock},
+            #{brandId}, #{productType}, #{tags}, #{unit}, #{normalPrice}, #{price}, #{includedTax}, #{minBuyNumber}, #{stock},
             <if test="productCategory != null and  productCategory != ''">
                 #{productCategory},
             </if>
@@ -173,7 +173,7 @@
             shopID = #{shopId}, name = #{name}, aliasName = #{aliasName}, commodityType = #{commodityType},
             bigTypeId = #{bigTypeId}, smallTypeId = #{smallTypeId}, tinyTypeId = #{tinyTypeId}, mainImage = #{mainImage},
             brandId = #{brandId}, productType = #{productType}, tags = #{tags}, unit = #{unit}, normalPrice = #{normalPrice},
-            price = #{price}, price1 = #{price}, includedTax = #{includedTax}, minBuyNumber = #{minBuyNumber}, stock = #{stock},
+            price = #{price}, includedTax = #{includedTax}, minBuyNumber = #{minBuyNumber}, stock = #{stock},
             <if test="productCategory != null and  productCategory != ''">
                 productCategory = #{productCategory},
             </if>
@@ -205,7 +205,7 @@
                 recommendType = #{recommendType},
             </if>
             <if test="priceFlag != null and  priceFlag != ''">
-                price1TextFlag = #{priceFlag},
+                priceFlag = #{priceFlag},
             </if>
             <if test="actFlag != null and  actFlag != ''">
                 actFlag = #{actFlag},
@@ -351,11 +351,10 @@
 			p.shopID as shopId,
 			p.`name` as `name`,
 			p.mainImage as image,
-			p.price1 as price,
+			p.price,
 			p.unit as unit,
-			p.price1TextFlag as priceFlag,
-            IFNULL(p.visibility,3) as visibility,
-		    p.price8Text as beautyActFlag
+			p.priceFlag,
+            IFNULL(p.visibility,3) as visibility
 		from product p
         where p.shopID = #{shopId}
         and p.visibility in
@@ -374,11 +373,10 @@
             p.mainImage as image,
             p.unit,
             p.productCode as code,
-            p.price1TextFlag as priceFlag,
-            p.price1 as price,
+            p.priceFlag,
+            p.price,
             p.shopID as shopId,
             p.searchKey as keyword,
-            p.price8Text as beautyActFlag,
             p.minBuyNumber as minBuyNumber,
             p.maxBuyNumber as maxBuyNumber,
             p.ladderPriceFlag,
@@ -469,8 +467,8 @@
     <select id="getProductForm" resultType="com.caimei365.commodity.model.vo.ProductFormVo">
         select productID as productId, shopID as shopId,  name, aliasName, commodityType, mainImage, stock, invoiceType,
             bigTypeID as bigTypeId, smallTypeID as smallTypeId, tinyTypeID as tinyTypeId, searchKey, visibility,
-            brandID as brandId,  productType, tags, unit, normalPrice, price1 as price, includedTax, minBuyNumber,
-            productCategory, serviceNumber, supplierTaxPoint, price1TextFlag as priceFlag, actFlag, ladderPriceFlag,
+            brandID as brandId,  productType, tags, unit, normalPrice, price, includedTax, minBuyNumber,
+            productCategory, serviceNumber, supplierTaxPoint, priceFlag, actFlag, ladderPriceFlag,
             addTime, hasSkuFlag, sellNumber, sortIndex, featuredFlag, costCheckFlag, recommendType, machineType,
             productCode, updateTime, validFlag, searchKey, allAreaFlag, step, costPrice, provinceIds, qualificationImg,
             trainingMethod, trainingType ,trainingFee
@@ -498,7 +496,7 @@
     </select>
     <select id="getProductShopById" resultType="com.caimei365.commodity.model.vo.ShopVo">
         select userID as userId, shopID as shopId, name, sname as shortName, linkMan, contractMobile,
-               contractEmail1 as contractEmail, contractEmail1 as email, provinceID as proviceId, cityID as cityId, townID as townId,
+               contractEmail, contractEmail as email, provinceID as proviceId, cityID as cityId, townID as townId,
                address, socialCreditCode, businessLicenseImage as businessLicense, firstShopType, secondShopType,
                mainpro as mainProduct, productDesc as mainProductDesc,legalPerson,registeredCapital,fax as faxNumber,
                nature as companyNature, turnover, medicalPracticeLicenseImg1 as medicalPracticeLicense, info as shopDesc,

src/main/resources/mapper/UserLikeMapper.xml

@@ -40,10 +40,9 @@
                p.mainImage       AS image,
                p.unit,
                p.productCode     AS CODE,
-               p.price1TextFlag  AS priceFlag,
-               p.price1          AS price,
+               p.priceFlag,
+               p.price,
                p.searchKey       AS keyword,
-               p.price8Text      AS beautyActFlag,
                p.minBuyNumber    AS minBuyNumber,
                p.maxBuyNumber    AS maxBuyNumber,
                p.ladderPriceFlag,