Commit 8c3852c8 authored by zhangfeng's avatar zhangfeng Committed by wux

恢复

parent 29eb4633
...@@ -110,7 +110,7 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> { ...@@ -110,7 +110,7 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
"left join ecw_warehouse_line de on o.line_id = de.id ", "left join ecw_warehouse_line de on o.line_id = de.id ",
"left join ecw_order_consignor nor on nor.order_id = o.order_id ", "left join ecw_order_consignor nor on nor.order_id = o.order_id ",
"left join ecw_order_consignee nee on nee.order_id = o.order_id ", "left join ecw_order_consignee nee on nee.order_id = o.order_id ",
"where r.deleted = 0 and r.receipt_id is null and o.order_id is not null ", "where r.deleted = 0 and r.receipt_id is null ",
"<when test = 'query.status != null'>", "<when test = 'query.status != null'>",
"AND o.`status` = #{query.status}", "AND o.`status` = #{query.status}",
"</when>", "</when>",
...@@ -423,4 +423,4 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> { ...@@ -423,4 +423,4 @@ public interface ReceivableMapper extends AbstractMapper<ReceivableDO> {
int countBatchGenReceiptPage(@Param("query") BatchGenReceiptPageQueryVO query); int countBatchGenReceiptPage(@Param("query") BatchGenReceiptPageQueryVO query);
List<CurrencyAmount> calculateReceivableAmountByOrderId(Long orderId); List<CurrencyAmount> calculateReceivableAmountByOrderId(Long orderId);
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment