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

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

@@ -765,7 +765,7 @@
         left join cm_pay_shop_record cpsr on a.shopOrderID = cpsr.shopOrderID
         left join bp_order_userinfo bou on bou.orderId = a.orderID
         left join cm_order co on co.orderID = a.orderID
-        LEFT JOIN cm_receipt_order_relation cror ON cror.orderId = co.orderId and cror.delFlag = 0
+        LEFT JOIN cm_receipt_order_relation cror ON cror.shopOrderId = a.shopOrderId and cror.delFlag = 0
         LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id and cdr.delFlag = 0
         left join shop s on s.shopID = a.shopID
         LEFT JOIN club c ON c.userID = a.userID