Merge remote-tracking branch 'origin/master'

mec-biz/src/main/resources/config/mybatis/SellOrderMapper.xml

@@ -533,7 +533,7 @@
     </select>
 
     <select id="getSellOrderByParentGoodsId" resultMap="SellOrder">
-        SELECT * FROM sell_order WHERE order_id_ = #{orderId}
+        SELECT * FROM sell_order WHERE order_id_ = #{orderId} AND status_=0
         <if test="parentGoodsId != null">
             AND parent_goods_id_ = #{parentGoodsId}
         </if>