SQL字段 bugfix

src/main/resources/mapper/BaseMapper.xml

@@ -154,7 +154,7 @@
     <select id="getPostageFlagList" resultType="com.caimei365.order.model.vo.ProductPostageVo">
         SELECT
             productID AS productId,
-            postageFlag AS postageFlag,
+            freePostFlag AS postageFlag,
             commodityType
         FROM product
         WHERE validFlag='2' AND productID in

src/main/resources/mapper/CartSellerMapper.xml

@@ -2,14 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.order.mapper.CartSellerMapper">
     <select id="getSellerCartShops" resultType="com.caimei365.order.model.vo.CartShopVo">
-        SELECT
+        SELECT DISTINCT
             c.shopId,
             s.name AS shopName,
             s.logo AS shopLogo
         FROM bp_order_product_cart c
         LEFT JOIN shop s ON c.shopId = s.shopID
         WHERE c.serviceProviderId = #{serviceProviderId} AND c.clubId = #{clubId}
-        GROUP BY c.shopId
+        GROUP BY c.shopId, c.id
         ORDER BY c.id DESC
     </select>
     <select id="getSellerCartProducts" resultType="com.caimei365.order.model.vo.CartItemVo">
@@ -55,11 +55,11 @@
     </select>
     <update id="updateSellerCart" parameterType="com.caimei365.order.model.po.SellerCartPo">
         UPDATE bp_order_product_cart
-        set num = #{num}, addTime = #{addTime}
+        set num = #{num}, addDate = #{addTime}
         WHERE id = #{id}
     </update>
     <insert id="insertSellerCart" keyColumn="id" keyProperty="id"  parameterType="com.caimei365.order.model.po.SellerCartPo" useGeneratedKeys="true">
-        INSERT INTO bp_order_product_cart (serviceProviderId, clubId, productId, num, addTime)
+        INSERT INTO bp_order_product_cart (serviceProviderId, clubId, productId, num, addDate)
         VALUES (#{serviceProviderId}, #{clubId}, #{productId}, #{num}, #{addTime})
     </insert>
     <delete id="deleteSellerCartByIds">
@@ -90,7 +90,7 @@
         LIMIT 1
     </select>
     <select id="getCartShopsByProductIds" resultType="com.caimei365.order.model.vo.CartShopVo">
-        SELECT
+        SELECT DISTINCT
             c.shopId,
             s.name AS shopName,
             s.logo AS shopLogo
@@ -101,7 +101,7 @@
         <foreach collection="productIds" open="(" separator="," close=")" item="productId">
             #{productId}
         </foreach>
-        GROUP BY c.shopId
+        GROUP BY c.shopId, c.id
         ORDER BY c.id DESC
     </select>
     <select id="getCartProductsByProductIds" resultType="com.caimei365.order.model.vo.CartItemVo">
@@ -166,7 +166,7 @@
             p.`name` AS `name`,
             p.mainImage AS image,
             p.validFlag AS validFlag
-        FROM cm_order_product
+        FROM cm_order_product op
         LEFT JOIN product p ON op.productID = p.productID
         WHERE orderID = #{orderID}
         GROUP BY op.ProductID

src/main/resources/mapper/OrderClubMapper.xml

@@ -174,7 +174,7 @@
             cop.productId,
             cop.shopId,
             cop.name,
-            cop.image,
+            cop.productImage AS image,
             cop.price1 AS price,
             cop.shopName,
             cop.costPrice,
@@ -304,7 +304,7 @@
         ORDER BY orderTime DESC
     </select>
     <select id="getOrderListByKeyword" resultType="com.caimei365.order.model.vo.OrderVo">
-        SELECT
+        SELECT DISTINCT
         co.orderID AS orderId,
         co.orderSource,
         co.orderNo,
@@ -351,7 +351,7 @@
         LEFT JOIN cm_order_product cop ON co.orderID = cop.orderID
         WHERE co.delFlag = 0 AND co.userID = #{userId}
         AND cop.name LIKE CONCAT('%',#{searchWord},'%')
-        GROUP BY co.orderID
+        GROUP BY co.orderID, co.orderTime
         ORDER BY co.orderTime DESC
     </select>
     <select id="getOrderSearchHistory" resultType="com.caimei365.order.model.vo.SearchHistoryVo">

src/main/resources/mapper/OrderSellerMapper.xml

@@ -159,7 +159,7 @@
         SELECT userID FROM serviceprovider WHERE serviceProviderID = #{serviceProviderId}
     </select>
     <select id="getOrderListByKeyword" resultType="com.caimei365.order.model.vo.OrderVo">
-        SELECT
+        SELECT DISTINCT
         orderID AS orderId,
         co.orderSource,
         co.orderNo,
@@ -209,7 +209,7 @@
             #{userId}
         </foreach>
         AND cop.name LIKE CONCAT('%',#{searchWord},'%')
-        GROUP BY co.orderID
+        GROUP BY co.orderID, co.orderTime
         ORDER BY co.orderTime DESC
     </select>
 </mapper>

src/main/resources/mapper/PayOrderMapper.xml

@@ -30,7 +30,7 @@
         WHERE userID = #{userId}
     </update>
     <insert id="insertOrderPayLink" keyColumn="id" keyProperty="id"  parameterType="com.caimei365.order.model.vo.OrderPayLinkVo" useGeneratedKeys="true">
-        INSERT INTO (orderId, linkLogo, unpaidAmount, generateTime, effectiveTime, payStatus, payType, delFlag)
+        INSERT INTO cm_order_pay_link (orderId, linkLogo, unpaidAmount, generateTime, effectiveTime, payStatus, payType, delFlag)
         VALUES (#{orderId}, #{linkLogo}, #{unpaidAmount}, #{generateTime}, #{effectiveTime}, #{payStatus}, #{payType}, #{delFlag})
     </insert>
     <insert id="insertSplitAccount" keyColumn="id" keyProperty="id"  parameterType="com.caimei365.order.model.po.SplitAccountPo">

src/main/resources/mapper/ShipMapper.xml

@@ -223,7 +223,7 @@
     </select>
     <select id="getLogisticsCompany" resultType="com.caimei365.order.model.vo.CompanyVo">
         SELECT id, value, label
-        FROM sys_dict	WHERE TYPE= "kd_type"
+        FROM sys_dict	WHERE `type`='kd_type'
         <if test="value != null and value != ''">
             AND value = #{value}
         </if>
@@ -279,7 +279,7 @@
     </select>
     <select id="getAllSendOutStatus" resultType="java.lang.Integer">
         SELECT sendOutStatus FROM cm_shop_order
-        WHERE cso.delFlag = 0 AND orderID = #{orderId}
+        WHERE  delFlag = 0 AND orderID = #{orderId}
     </select>
     <select id="getOrderIdByShopOrder" resultType="java.lang.Integer">
         SELECT orderID FROM cm_shop_order

src/main/resources/mapper/SubmitMapper.xml

@@ -18,18 +18,18 @@
                 #{clauseId},#{clauseName})
     </insert>
     <insert id="insertShopOrder" keyColumn="shopOrderID" keyProperty="shopOrderId" parameterType="com.caimei365.order.model.po.OrderShopPo" useGeneratedKeys="true">
-        INSERT INTO cm_shop_order (shopOrderNo, orderID, orderNo, shopID, shopName, note, userID, clubID,
+        INSERT INTO cm_shop_order (shopOrderNo, orderID, orderNo, shopID, note, userID, clubID,
                                    spID, orderPromotionsId, promotionFullReduction, brokerage, canRefundAmount, itemCount,
                                    totalAmount, productAmount, needPayAmount, shopProductAmount, shopPostFee, shopTaxFee,
                                    shouldPayShopAmount, orderTime, orderSubmitType, splitFlag)
-        VALUES (#{shopOrderNo},#{orderId},#{orderNo},#{shopId},#{shopName},#{note},#{userId},#{clubId},
+        VALUES (#{shopOrderNo},#{orderId},#{orderNo},#{shopId}, #{note},#{userId},#{clubId},
                 #{spId},#{orderPromotionsId},#{promotionFullReduction},#{brokerage},#{canRefundAmount},#{itemCount},
                 #{totalAmount},#{productAmount},#{needPayAmount},#{shopProductAmount},#{shopPostFee},#{shopTaxFee},
                 #{shouldPayShopAmount},#{orderTime},#{orderSubmitType},#{splitFlag})
     </insert>
     <insert id="insertOrderProduct" keyColumn="orderProductID" keyProperty="orderProductId" parameterType="com.caimei365.order.model.po.OrderProductPo" useGeneratedKeys="true">
         INSERT INTO cm_order_product (orderID, orderNo, shopOrderID, shopOrderNo, orderPromotionsId, productId, shopId, name,
-                                    image, price, price1, shopName, costPrice, normalPrice, ladderPriceFlag, discountPrice, discount,
+                                    productImage, price, price1, shopName, costPrice, normalPrice, ladderPriceFlag, discountPrice, discount,
                                     totalAmount, totalFee, shouldPayFee, productUnit, num, presentNum, discountFee, includedTax,
                                     invoiceType, taxRate, addedValueTax, totalAddedValueTax, singleShouldPayTotalTax, shouldPayTotalTax,
                                     shopProductAmount, singleShopFee, shopFee, singleOtherFee, otherFee, singleCmFee, cmFee,
@@ -46,7 +46,7 @@
         VALUES (#{orderId},#{id},#{name},#{description},#{type},#{mode},#{touchPrice},#{reducedPrice},#{status},#{beginTime},#{endTime})
     </insert>
     <insert id="insertLadderPrices" keyColumn="id" keyProperty="id" parameterType="com.caimei365.order.model.vo.LadderPriceVo" useGeneratedKeys="true">
-        INSERT INTO (orderProductId, ladderNum, buyNum, buyPrice, createDate)
+        INSERT INTO order_product_ladder_price (orderProductId, ladderNum, buyNum, buyPrice, createDate)
         VALUES (#{orderProductId},#{ladderNum},#{buyNum},#{buyPrice},#{createDate})
     </insert>
     <update id="updateShopOrderIds">
@@ -59,9 +59,9 @@
     </insert>
     <insert id="insertOrderUserInfo" parameterType="com.caimei365.order.model.po.OrderUserInfoPo">
         INSERT INTO bp_order_userinfo (orderId, clubId, userId, name, shouHuoRen, mobile,
-                                        addressId, townId, province, city, town, address)
+                                       townId, province, city, town, address)
         VALUES (#{orderId}, #{clubId}, #{userId}, #{name}, #{receiver}, #{mobile},
-                #{addressId}, #{townId}, #{province}, #{city}, #{town}, #{address})
+                #{townId}, #{province}, #{city}, #{town}, #{address})
     </insert>
     <insert id="insertCouponOrderRecord" parameterType="com.caimei365.order.model.po.CouponOrderRecordPo">
         INSERT INTO cm_coupon_order_record (orderId, clubCouponId, couponType, couponAmount, touchPrice, createDate)