merge

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -475,7 +475,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             o.user_id = #{userId}
           AND o.order_status = 1
-          AND o.pay_status = 2
+          AND og.pay_status in (2,3,4)
+          AND og.refund_status != 2
+          AND og.status = 1
           AND o.`status` = 1
           AND g.`status` = 1
           AND g.goods_type = 6