~jiangyouyao/beauty-erp.git

			@@ -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}