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

src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -84,7 +84,7 @@ public interface OrderCommonMapper {
      * 支付记录(收款记录)
      * @param orderId 订单Id
      */
-    List<DiscernReceiptVo> getDiscernReceipt(Integer orderId, String shopOrderId);
+    List<DiscernReceiptVo> getDiscernReceipt(@Param("orderId") Integer orderId, @Param("shopOrderId") String shopOrderId);
     /**
      * 超级会员支付记录
      * @param vipRecordId 购买记录Id

src/main/resources/mapper/OrderCommonMapper.xml

@@ -232,8 +232,7 @@
                cror.associateAmount
         FROM cm_receipt_order_relation cror
                  LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
-        WHERE ((cror.orderID = #{orderId} AND cror.relationType = '2') OR
-               (cror.shopOrderId = #{shopOrderId} AND cror.relationType = '2'))
+        WHERE cror.shopOrderId = #{shopOrderId} AND cror.relationType = '2'
           AND cror.delFlag = '0'
           AND cdr.delFlag = '0'
           AND cdr.receiptStatus = '3'