|
|
@@ -949,7 +949,7 @@
|
|
|
cdr.confirmType AS confirmType,
|
|
|
cdr.receiptType AS receiptType,
|
|
|
cdr.payType AS payType,
|
|
|
- cof.bankAccount AS bankNameType,
|
|
|
+ IFNULL(cof.bankAccount,'未知')AS bankNameType,
|
|
|
cdr.receiptAmount AS receiptAmount,
|
|
|
cror.associationType AS associationType,
|
|
|
cdr.payWay AS payWay,
|
|
|
@@ -967,8 +967,8 @@
|
|
|
cdr.cancelDate AS cancelDate,
|
|
|
cdr.cancelReason AS cancelReason
|
|
|
from cm_receipt_order_relation cror
|
|
|
- join cm_discern_receipt cdr on cdr.id = cror.receiptID
|
|
|
- join cm_offline_collection cof on cdr.payType = cof.type
|
|
|
+ left join cm_discern_receipt cdr on cdr.id = cror.receiptID
|
|
|
+ left join cm_offline_collection cof on cdr.payType = cof.type
|
|
|
where cror.delFlag = '0' and cdr.delFlag = '0'
|
|
|
<if test="identifying == 2">
|
|
|
<if test="relationType == 1">
|
|
|
@@ -977,6 +977,9 @@
|
|
|
<if test="relationType == 2">
|
|
|
and cror.orderID = #{orderID} and (cror.relationType = '2' or cror.relationType = '7')
|
|
|
</if>
|
|
|
+ <if test="relationType == 7">
|
|
|
+ and cror.shopOrderId = #{shopOrderID} and (cror.relationType = '2' or cror.relationType = '7')
|
|
|
+ </if>
|
|
|
</if>
|
|
|
<if test="identifying == 1">
|
|
|
and cror.shopOrderId = #{shopOrderID} and (cror.relationType = 2 or cror.relationType = 7)
|
zhijiezhao