|
@@ -24,13 +24,13 @@
|
|
|
(
|
|
(
|
|
|
cror.orderID = #{orderID}
|
|
cror.orderID = #{orderID}
|
|
|
AND cror.relationType = '2'
|
|
AND cror.relationType = '2'
|
|
|
- )
|
|
|
|
|
- OR (
|
|
|
|
|
|
|
+ OR
|
|
|
cror.orderID = #{shopOrderIDs}
|
|
cror.orderID = #{shopOrderIDs}
|
|
|
AND cror.relationType = '1'
|
|
AND cror.relationType = '1'
|
|
|
)
|
|
)
|
|
|
AND cror.delFlag = '0'
|
|
AND cror.delFlag = '0'
|
|
|
AND cdr.delFlag = '0'
|
|
AND cdr.delFlag = '0'
|
|
|
|
|
+ AND cdr.payType != '16'
|
|
|
ORDER BY
|
|
ORDER BY
|
|
|
cdr.receiptDate DESC
|
|
cdr.receiptDate DESC
|
|
|
</select>
|
|
</select>
|
plf