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

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

@@ -1064,7 +1064,7 @@
                  LEFT JOIN cm_order_product cop ON a.shopOrderID = cop.shopOrderID
                  LEFT JOIN product p ON cop.productID = p.productID
         WHERE co.organizeID = 0
-          AND co.refundType != 2
+          AND a.refundStatus = 1
           AND co.delFlag = 0
           AND co.orderType != 2
           AND a.delFlag = 0