Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml

@@ -548,7 +548,7 @@
   </select>

   <!-- 分页查询 -->
   <select id="selectInPageByQuery" resultMap="ShopOrderMap">
   <select id="selectInPageByQuery" resultMap="ShopOrderComplexMap">
      select
      o.*,
      s.shop_name
@@ -623,7 +623,7 @@
      o.wx_order_no,
      o.pay_result,
      o.postage,
             o.pay_method
             o.pay_method,
      s.shop_name,
      o.order_type
      from shop_order o
@@ -756,6 +756,13 @@
      group by order_status
   </select>

   <select id="selectShopOrderByOrderNo"  resultType="com.matrix.system.shopXcx.bean.ShopOrder"  >
      select
      a.*
      from shop_order a
      where a.order_no=#{orderNo}
   </select>

   <update id="batchUpdateOrderStatus">
      <foreach collection="list" index="index" item="item" separator=";">
         update shop_order set order_status=#{item.orderStatus}