Browse Source

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

huangzhiguo 2 years ago
parent
commit
f8d1e58934
1 changed files with 2 additions and 1 deletions
  1. 2 1
      src/main/resources/mappings/modules/order/OrderMapper.xml

+ 2 - 1
src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1014,8 +1014,9 @@
         FROM cm_receipt_order_relation cror
         LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
         LEFT JOIN cm_order co ON cror.orderID = co.orderID
+        left join cm_shop_order cso on cso.orderId = cror.orderID
         WHERE cror.relationType = 2
-          AND a.receiptStatus=3
+          AND cso.receiptStatus=3
           AND cror.delFlag = 0
           AND cror.mbOrderId IS NOT NULL
           AND cror.splitStatus = 0