数据库字段整理

src/main/resources/mapper/BaseMapper.xml

@@ -87,7 +87,7 @@
         where r.productId = #{productId}
           and r.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="getPromotionByShopId" resultType="com.caimei365.order.model.vo.PromotionsVo">
@@ -147,7 +147,7 @@
                cpg.number  AS number,
                0           AS price,
                2           as productType,
-               p.price1    AS originalPrice,
+               p.price    AS originalPrice,
                p.unit      AS unit,
                p.stock     AS stock,
                p.validFlag AS validFlag

src/main/resources/mapper/CartClubMapper.xml

@@ -53,13 +53,13 @@
             p.`name` AS `name`,
             p.mainImage AS image,
             p.productCode,
-            p.price1 AS price,
-            p.price1 AS originalPrice,
+            p.price,
+            p.price AS originalPrice,
             p.unit AS unit,
             p.stock AS stock,
             p.step AS step,
             p.minBuyNumber AS min,
-            p.price1TextFlag AS priceFlag,
+            p.priceFlag,
             p.ladderPriceFlag AS ladderFlag,
             p.includedTax AS includedTax,
             p.invoiceType AS invoiceType,
@@ -85,13 +85,13 @@
         p.`name` AS `name`,
         p.mainImage AS image,
         p.productCode,
-        p.price1 AS price,
-        p.price1 AS originalPrice,
+        p.price,
+        p.price AS originalPrice,
         p.unit AS unit,
         p.stock AS stock,
         p.step AS step,
         p.minBuyNumber AS min,
-        p.price1TextFlag AS priceFlag,
+        p.priceFlag,
         p.ladderPriceFlag AS ladderFlag,
         p.includedTax AS includedTax,
         p.invoiceType AS invoiceType,
@@ -121,13 +121,13 @@
         p.`name` AS `name`,
         p.mainImage AS image,
         p.productCode,
-        p.price1 AS price,
-        p.price1 AS originalPrice,
+        p.price,
+        p.price AS originalPrice,
         p.unit AS unit,
         p.stock AS stock,
         p.step AS step,
         p.minBuyNumber AS min,
-        p.price1TextFlag AS priceFlag,
+        p.priceFlag,
         p.ladderPriceFlag AS ladderFlag,
         p.includedTax AS includedTax,
         p.invoiceType AS invoiceType,
@@ -157,13 +157,13 @@
             p.`name` AS `name`,
             p.mainImage AS image,
             p.productCode,
-            p.price1 AS price,
-            p.price1 AS originalPrice,
+            p.price,
+            p.price AS originalPrice,
             p.unit AS unit,
             p.stock AS stock,
             p.step AS step,
             p.minBuyNumber AS min,
-            p.price1TextFlag AS priceFlag,
+            p.priceFlag,
             p.ladderPriceFlag AS ladderFlag,
             p.includedTax AS includedTax,
             p.invoiceType AS invoiceType,
@@ -173,7 +173,7 @@
         FROM cm_cart c
         LEFT JOIN product p ON c.productID = p.productID
         WHERE p.validFlag='2' AND c.userID = #{userId}
-        AND p.price1TextFlag != '1'
+        AND p.priceFlag != '1'
         AND p.stock != '0' AND p.stock <![CDATA[ >= ]]> c.productCount
         ORDER BY c.cm_cartID DESC
     </select>
@@ -239,13 +239,13 @@
         p.`name` AS `name`,
         p.mainImage AS image,
         p.productCode,
-        p.price1 AS price,
-        p.price1 AS originalPrice,
+        p.price,
+        p.price AS originalPrice,
         p.unit AS unit,
         p.stock AS stock,
         p.step AS step,
         p.minBuyNumber AS min,
-        p.price1TextFlag AS priceFlag,
+        p.priceFlag,
         p.ladderPriceFlag AS ladderFlag,
         p.includedTax AS includedTax,
         p.invoiceType AS invoiceType,

src/main/resources/mapper/CartSellerMapper.xml

@@ -21,13 +21,13 @@
             p.`name` AS `name`,
             p.mainImage AS image,
             p.productCode,
-            p.price1 AS price,
-            p.price1 AS originalPrice,
+            p.price,
+            p.price AS originalPrice,
             p.unit AS unit,
             p.stock AS stock,
             p.step AS step,
             p.minBuyNumber AS min,
-            p.price1TextFlag AS priceFlag,
+            p.priceFlag,
             p.ladderPriceFlag AS ladderFlag,
             p.includedTax AS includedTax,
             p.invoiceType AS invoiceType,
@@ -110,13 +110,13 @@
             p.`name` AS `name`,
             p.mainImage AS image,
             p.productCode,
-            p.price1 AS price,
-            p.price1 AS originalPrice,
+            p.price,
+            p.price AS originalPrice,
             p.unit AS unit,
             p.stock AS stock,
             p.step AS step,
             p.minBuyNumber AS min,
-            p.price1TextFlag AS priceFlag,
+            p.priceFlag,
             p.ladderPriceFlag AS ladderFlag,
             p.includedTax AS includedTax,
             p.invoiceType AS invoiceType,
@@ -144,10 +144,10 @@
             p.`name` AS `name`,
             p.mainImage AS image,
             p.productCode,
-            p.price1 AS price,
+            p.price,
             cshd.originalPrice AS originalPrice,
             p.unit AS unit,
-            p.price1TextFlag AS priceFlag,
+            p.priceFlag,
             p.ladderPriceFlag AS ladderFlag,
             p.includedTax AS includedTax,
             p.invoiceType AS invoiceType,

src/main/resources/mapper/OrderClubMapper.xml

@@ -427,7 +427,6 @@
             returnedWay,
             payType,
             operatingOrderStatus,
-            returnedBankInfo,
             bankAccountName,
             bankAccountNo,
             openBank,

src/main/resources/mapper/SubmitMapper.xml

@@ -47,7 +47,7 @@
             parameterType="com.caimei365.order.model.po.OrderProductPo" useGeneratedKeys="true">
         INSERT INTO cm_order_product (orderID, orderNo, shopOrderID, shopOrderNo, orderPromotionsId, productId, shopId,
                                       name,
-                                      productImage, price, price1, shopName, costPrice, normalPrice, ladderPriceFlag,
+                                      productImage, price, shopName, costPrice, normalPrice, ladderPriceFlag,
                                       discountPrice, discount,
                                       totalAmount, totalFee, shouldPayFee, productUnit, num, presentNum, discountFee,
                                       includedTax,
@@ -60,7 +60,7 @@
                                       svipDiscount, svipReduction)
         VALUES (#{orderId}, #{orderNo}, #{shopOrderId}, #{shopOrderNo}, #{orderPromotionsId}, #{productId}, #{shopId},
                 #{name},
-                #{image}, #{price}, #{price}, #{shopName}, #{costPrice}, #{normalPrice}, #{ladderPriceFlag},
+                #{image}, #{price}, #{shopName}, #{costPrice}, #{normalPrice}, #{ladderPriceFlag},
                 #{discountPrice}, #{discount},
                 #{totalAmount}, #{totalFee}, #{shouldPayFee}, #{productUnit}, #{num}, #{presentNum}, #{discountFee},
                 #{includedTax},
@@ -183,7 +183,7 @@
                p.shopID           AS shopId,
                p.`name`           AS `name`,
                p.mainImage        AS image,
-               p.price1           AS price,
+               p.price,
                p.costPrice,
                IFNULL(p.costCheckFlag, 1) AS costCheckFlag,
                p.costProportional,