sku购物车bugfix

src/main/resources/mapper/CartClubMapper.xml

@@ -3,26 +3,25 @@
 <mapper namespace="com.caimei365.order.mapper.CartClubMapper">
     <!-- 购物车供应商列表 -->
     <select id="getCartShops" resultType="com.caimei365.order.model.vo.CartShopVo">
-        SELECT DISTINCT
-            c.shopID AS shopId,
-            s.name AS shopName,
-            s.logo AS shopLogo,
-            s.shopType as shopType
+        SELECT DISTINCT c.shopID   AS shopId,
+                        s.name     AS shopName,
+                        s.logo     AS shopLogo,
+                        s.shopType as shopType
         FROM cm_cart c
-        LEFT JOIN shop s ON c.shopID = s.shopID
+                 LEFT JOIN shop s ON c.shopID = s.shopID
         WHERE c.userID = #{userId}
         GROUP BY c.shopID, c.cm_cartID
         ORDER BY c.cm_cartID DESC
     </select>
     <select id="getCartShopsByProductIds" resultType="com.caimei365.order.model.vo.CartShopVo">
         SELECT DISTINCT
-            c.shopID AS shopId,
-            s.name AS shopName,
-            s.logo AS shopLogo,
-            s.shopType as shopType
-            <if test="status!=null and status == 1">
-                ,p.splitCode
-            </if>
+        c.shopID AS shopId,
+        s.name AS shopName,
+        s.logo AS shopLogo,
+        s.shopType as shopType
+        <if test="status!=null and status == 1">
+            ,p.splitCode
+        </if>
         FROM cm_cart c
         LEFT JOIN shop s ON c.shopID = s.shopID
         LEFT JOIN product p ON c.productID = p.productID
@@ -52,39 +51,39 @@
     </select>
 
     <select id="getCartProductsByShopId" resultType="com.caimei365.order.model.vo.CartItemVo">
-        SELECT
-            c.cm_cartID AS id,
-            c.productCount AS number,
-            p.productID AS productId,
-            p.shopID AS shopId,
-            p.`name` AS `name`,
-            p.mainImage AS image,
-            p.productCode,
-            c.skuId,
-            cs.price,
-            cs.price AS originalPrice,
-            cs.unit AS unit,
-            cs.stock AS stock,
-            p.step AS step,
-            cs.minBuyNumber AS min,
-            p.priceFlag,
-            cs.ladderPriceFlag AS ladderFlag,
-            p.includedTax AS includedTax,
-            p.invoiceType AS invoiceType,
-            p.taxPoint AS taxRate,
-            p.productCategory,
-            p.validFlag AS validFlag,
-            p.visibility,
-            if(csp.id is not null,1,0) as svipProductFlag,
-            csp.priceType as svipPriceType,
-            csp.discount as svipDiscount,
-            csp.discountPrice as svipDiscountPrice,
-            p.productType
+        SELECT c.cm_cartID                  AS id,
+               c.productCount               AS number,
+               p.productID                  AS productId,
+               p.shopID                     AS shopId,
+               p.`name`                     AS `name`,
+               p.mainImage                  AS image,
+               p.productCode,
+               c.skuId,
+               cs.price,
+               cs.price                     AS originalPrice,
+               cs.unit                      AS unit,
+               cs.stock                     AS stock,
+               p.step                       AS step,
+               cs.minBuyNumber              AS min,
+               p.priceFlag,
+               cs.ladderPriceFlag           AS ladderFlag,
+               p.includedTax                AS includedTax,
+               p.invoiceType                AS invoiceType,
+               p.taxPoint                   AS taxRate,
+               p.productCategory,
+               p.validFlag                  AS validFlag,
+               p.visibility,
+               if(csp.id is not null, 1, 0) as svipProductFlag,
+               csp.priceType                as svipPriceType,
+               csp.discount                 as svipDiscount,
+               csp.discountPrice            as svipDiscountPrice,
+               p.productType
         FROM cm_cart c
-        LEFT JOIN product P on c.productID = p.productID
-        LEFT JOIN cm_sku cs ON c.skuId = cs.skuId
-        LEFT JOIN cm_svip_product csp ON c.productID = csp.productId
-        WHERE c.userID = #{userId} and p.shopID = #{shopId}
+                 LEFT JOIN product P on c.productID = p.productID
+                 LEFT JOIN cm_sku cs ON c.skuId = cs.skuId
+                 LEFT JOIN cm_svip_product csp ON c.productID = csp.productId
+        WHERE c.userID = #{userId}
+          and p.shopID = #{shopId}
         ORDER BY c.cm_cartID DESC
     </select>
     <select id="getCartProductsByShopIdAndProductIds" resultType="com.caimei365.order.model.vo.CartItemVo">
@@ -172,60 +171,63 @@
     </select>
 
     <select id="getCartProductList" resultType="com.caimei365.order.model.vo.CartItemVo">
-        SELECT
-            c.skuId as skuId,
-            c.cm_cartID AS id,
-            c.productCount AS number,
-            p.productID AS productId,
-            p.shopID AS shopId,
-            p.`name` AS `name`,
-            p.mainImage AS image,
-            p.productCode,
-            cs.price,
-            cs.price AS originalPrice,
-            cs.unit AS unit,
-            cs.stock AS stock,
-            p.step AS step,
-            cs.minBuyNumber AS min,
-            p.priceFlag,
-            cs.ladderPriceFlag AS ladderFlag,
-            p.includedTax AS includedTax,
-            p.invoiceType AS invoiceType,
-            p.taxPoint AS taxRate,
-            p.productCategory,
-            p.visibility,
-            p.validFlag AS validFlag,
-            p.productType
+        SELECT c.skuId            as skuId,
+               c.cm_cartID        AS id,
+               c.productCount     AS number,
+               p.productID        AS productId,
+               p.shopID           AS shopId,
+               p.`name`           AS `name`,
+               p.mainImage        AS image,
+               p.productCode,
+               cs.price,
+               cs.price           AS originalPrice,
+               cs.unit            AS unit,
+               cs.stock           AS stock,
+               p.step             AS step,
+               cs.minBuyNumber    AS min,
+               p.priceFlag,
+               cs.ladderPriceFlag AS ladderFlag,
+               p.includedTax      AS includedTax,
+               p.invoiceType      AS invoiceType,
+               p.taxPoint         AS taxRate,
+               p.productCategory,
+               p.visibility,
+               p.validFlag        AS validFlag,
+               p.productType
         FROM cm_cart c
-        LEFT JOIN product p ON c.productID = p.productID
-        LEFT JOIN cm_sku cs ON cs.skuId = c.skuId
-        WHERE p.validFlag='2' AND c.userID = #{userId}
-        AND p.priceFlag != '1'
-        AND p.stock != '0' AND p.stock <![CDATA[ >= ]]> c.productCount
+                 LEFT JOIN product p ON c.productID = p.productID
+                 LEFT JOIN cm_sku cs ON cs.skuId = c.skuId
+        WHERE p.validFlag = '2'
+          AND c.userID = #{userId}
+          AND p.priceFlag != '1'
+          AND cs.stock != '0'
+          AND cs.stock <![CDATA[ >= ]]> c.productCount
         ORDER BY c.cm_cartID DESC
     </select>
     <select id="getCartPo" resultType="com.caimei365.order.model.po.CartPo">
-        SELECT
-            c.cm_cartID AS id,
-            c.productCount,
-            c.productID AS productId,
-            c.shopID AS shopId,
-            c.userID AS userId,
-            c.skuId
+        SELECT c.cm_cartID AS id,
+               c.productCount,
+               c.productID AS productId,
+               c.shopID    AS shopId,
+               c.userID    AS userId,
+               c.skuId
         FROM cm_cart c
-        WHERE c.skuId = #{skuId} and c.userID = #{userId}
+        WHERE c.skuId = #{skuId}
+          and c.userID = #{userId}
         ORDER BY c.cm_cartID DESC
         limit 1
     </select>
     <update id="updateCart" parameterType="com.caimei365.order.model.po.CartPo">
-        UPDATE cm_cart set
-           productCount = #{productCount},
-           addTime = #{addTime}
-        WHERE userID = #{userId} AND skuId = #{skuId}
+        UPDATE cm_cart
+        set productCount = #{productCount},
+            addTime      = #{addTime}
+        WHERE userID = #{userId}
+          AND skuId = #{skuId}
     </update>
-    <insert id="insertCart" keyColumn="cm_cartID" keyProperty="id"  parameterType="com.caimei365.order.model.po.CartPo" useGeneratedKeys="true">
-        INSERT INTO cm_cart (shopID, productID, userID, productCount, addTime, reBuyFlag)
-        VALUES (#{shopId}, #{productId}, #{userId}, #{productCount}, #{addTime}, #{reBuyFlag})
+    <insert id="insertCart" keyColumn="cm_cartID" keyProperty="id" parameterType="com.caimei365.order.model.po.CartPo"
+            useGeneratedKeys="true">
+        INSERT INTO cm_cart (skuId, shopID, productID, userID, productCount, addTime, reBuyFlag)
+        VALUES (#{skuId}, #{shopId}, #{productId}, #{userId}, #{productCount}, #{addTime}, #{reBuyFlag})
     </insert>
     <delete id="deleteCartByProductIds">
         DELETE FROM cm_cart
@@ -236,67 +238,80 @@
         </foreach>
     </delete>
     <delete id="deleteUserInvoice">
-        delete from cm_user_invoiceinfo where userId = #{userId}
+        delete
+        from cm_user_invoiceinfo
+        where userId = #{userId}
     </delete>
     <insert id="insertUserInvoice">
         INSERT INTO cm_user_invoiceinfo (userId, invoiceTitle, corporationTaxNum,
-            registeredAddress, registeredPhone,bankAccountNo, openBank)
+                                         registeredAddress, registeredPhone, bankAccountNo, openBank)
         VALUES (#{userId}, #{invoiceTitle}, #{corporationTaxNum},
-             #{registeredAddress}, #{registeredPhone},  #{bankAccountNo}, #{openBank})
+                #{registeredAddress}, #{registeredPhone}, #{bankAccountNo}, #{openBank})
     </insert>
     <update id="updateUserInvoice">
         UPDATE cm_user_invoiceinfo
-        SET invoiceTitle = #{invoiceTitle},
+        SET invoiceTitle      = #{invoiceTitle},
             corporationTaxNum = #{corporationTaxNum},
             registeredAddress = #{registeredAddress},
-            registeredPhone = #{registeredPhone},
-            bankAccountNo = #{bankAccountNo},
-            openBank = #{openBank}
+            registeredPhone   = #{registeredPhone},
+            bankAccountNo     = #{bankAccountNo},
+            openBank          = #{openBank}
         WHERE userId = #{userId}
     </update>
     <select id="getUserInvoice" resultType="com.caimei365.order.model.vo.InvoiceVo">
-        SELECT id, userId, invoiceTitle, corporationTaxNum, registeredAddress, registeredPhone,bankAccountNo, openBank
+        SELECT id,
+               userId,
+               invoiceTitle,
+               corporationTaxNum,
+               registeredAddress,
+               registeredPhone,
+               bankAccountNo,
+               openBank
         FROM cm_user_invoiceinfo
         WHERE userId = #{userId}
-        order by id desc limit 1
+        order by id desc
+        limit 1
     </select>
     <select id="getCartItemByProductId" resultType="com.caimei365.order.model.vo.CartItemVo">
-        SELECT
-        p.productID AS productId,
-        p.shopID AS shopId,
-        p.`name` AS `name`,
-        p.mainImage AS image,
-        p.productCode,
-        cs.price,
-        cs.price AS originalPrice,
-        cs.unit AS unit,
-        cs.stock AS stock,
-        p.step AS step,
-        cs.minBuyNumber AS min,
-        p.priceFlag,
-        cs.ladderPriceFlag AS ladderFlag,
-        p.includedTax AS includedTax,
-        p.invoiceType AS invoiceType,
-        p.taxPoint AS taxRate,
-        p.productCategory,
-        p.validFlag AS validFlag,
-        p.visibility,
-        p.commodityType AS commodityType,
-        if(csp.id is not null,1,0) as svipProductFlag,
-        csp.priceType as svipPriceType,
-        csp.discount as svipDiscount,
-        csp.discountPrice as svipDiscountPrice,
-        p.productType
+        SELECT p.productID                  AS productId,
+               p.shopID                     AS shopId,
+               p.`name`                     AS `name`,
+               p.mainImage                  AS image,
+               p.productCode,
+               cs.price,
+               cs.price                     AS originalPrice,
+               cs.unit                      AS unit,
+               cs.stock                     AS stock,
+               p.step                       AS step,
+               cs.minBuyNumber              AS min,
+               p.priceFlag,
+               cs.ladderPriceFlag           AS ladderFlag,
+               p.includedTax                AS includedTax,
+               p.invoiceType                AS invoiceType,
+               p.taxPoint                   AS taxRate,
+               p.productCategory,
+               p.validFlag                  AS validFlag,
+               p.visibility,
+               p.commodityType              AS commodityType,
+               if(csp.id is not null, 1, 0) as svipProductFlag,
+               csp.priceType                as svipPriceType,
+               csp.discount                 as svipDiscount,
+               csp.discountPrice            as svipDiscountPrice,
+               p.productType
         FROM cm_sku cs
-        LEFT JOIN product p on p.productID = cs.productId
-        LEFT JOIN cm_svip_product csp ON p.productID = csp.productId
-        WHERE p.validFlag='2' AND cs.skuId = #{skuId}
+                 LEFT JOIN product p on p.productID = cs.productId
+                 LEFT JOIN cm_svip_product csp ON p.productID = csp.productId
+        WHERE p.validFlag = '2'
+          AND cs.skuId = #{skuId}
     </select>
 
     <select id="findVipCoupon" resultType="java.lang.Integer">
-        select couponId from cm_svip_coupon
+        select couponId
+        from cm_svip_coupon
     </select>
     <select id="getClubTypeById" resultType="java.lang.Integer">
-        SELECT firstClubType FROM club WHERE userID = #{userId}
+        SELECT firstClubType
+        FROM club
+        WHERE userID = #{userId}
     </select>
 </mapper>