Merge remote-tracking branch 'origin/developer' into developerL

src/main/resources/mappings/modules/order/OrderProductMapper.xml

@@ -109,7 +109,7 @@
         FROM cm_order_product a
         <include refid="orderProductJoins"/>
         WHERE a.orderProductID = #{orderProductID}
-        group by p.productID
+--         group by p.productID
     </select>
 
     <select id="findListByShopOrderID" resultType="NewOrderProduct">
@@ -120,7 +120,7 @@
         <include refid="orderProductJoins"/>
         LEFT JOIN cm_second_hand_detail csdh ON csdh.productID = a.productID
         WHERE a.shopOrderID = #{shopOrderID}
-        group by p.productID
+--         group by p.productID
     </select>
     <select id="findListProductOrderID"  resultType="com.caimei.modules.order.entity.NewOrderProduct">
         SELECT
@@ -130,7 +130,7 @@
         <include refid="orderProductJoins"/>
         LEFT JOIN cm_second_hand_detail csdh ON csdh.productID = a.productID
         WHERE a.orderID = #{orderID}
-        group by p.productID
+--         group by p.productID
     </select>
 
     <select id="getListByShopOrderID" resultType="NewOrderProduct">
@@ -147,7 +147,7 @@
         FROM cm_order_product a
         <include refid="orderProductJoins"/>
         WHERE a.orderID = #{orderID}
-        group by p.productID
+--         group by p.productID
     </select>
 
     <select id="findAllList" resultType="NewOrderProduct">
@@ -169,7 +169,7 @@
                 AND a.payStatus = #{payStatus}
             </if>
         </where>
-        group by p.productID
+--         group by p.productID
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
                 ORDER BY ${page.orderBy}
@@ -416,7 +416,7 @@
         LEFT JOIN shop s on s.shopID = a.shopID
         where a.orderID = #{orderID}
         -- AND a.productID != 999
-        group by p.productID
+--         group by p.productID
     </select>
 
     <!--通过订单ID获取订单商品并以供应商分组-->
@@ -489,7 +489,7 @@
         FROM cm_order_product a
         <include refid="orderProductJoins"/>
         WHERE a.orderProductID = #{orderProductID}
-        group by p.productID
+--         group by p.productID
     </select>
 
     <select id="getGroupOrderProductIdS" resultType="String">
@@ -563,7 +563,7 @@
                  left join user u on u.userID = co.userID
         where cop.shopOrderID = #{shopOrderID}
 --           and cs.organizeId=(SELECT SUBSTRING(groundMall, 1, 1)FROM product WHERE productID=cs.productId)
-        group by p.productID
+--         group by p.productID
     </select>
 
     <select id="CountReturnedPurchaseProduct" resultType="java.lang.Integer">

src/main/resources/mappings/modules/product/ProductMapper.xml

@@ -1817,7 +1817,6 @@
         WHERE csl.delFlag = 0
           AND csr.delFlag = 0
           AND p.productID = #{productID}
-        group by p.productID
     </select>
     <select id="qualification" resultType="com.caimei.modules.product.entity.Product">
         SELECT qualificationNo, productName, qualificationTime, qualificationLink