Commit 4bb44379 authored by 332784038@qq.com's avatar 332784038@qq.com

批量加价页面出货单订单列表查询业务补充查询参数

parent ac021d00
...@@ -661,6 +661,9 @@ public class OrderQueryVO { ...@@ -661,6 +661,9 @@ public class OrderQueryVO {
@ApiModelProperty(value = "付款人: 1 发货人 2 收货人 3 自定义") @ApiModelProperty(value = "付款人: 1 发货人 2 收货人 3 自定义")
private List<Integer> draweeList; private List<Integer> draweeList;
@ApiModelProperty(value = "是否特价")
private Boolean specialPriceType;
// @ApiModelProperty(value = "动态查询订单异常状态(字典 order_abnormal_state)") // @ApiModelProperty(value = "动态查询订单异常状态(字典 order_abnormal_state)")
// private List<Integer> dynamicAbnormalStateList; // private List<Integer> dynamicAbnormalStateList;
// //
......
...@@ -3809,6 +3809,24 @@ ...@@ -3809,6 +3809,24 @@
<if test="query.isNeat == false "> <if test="query.isNeat == false ">
AND o.sum_num <![CDATA[ < ]]> o.cost->>'$.totalNum' AND o.sum_num <![CDATA[ < ]]> o.cost->>'$.totalNum'
</if> </if>
<if test="query.specialPriceType != null and query.specialPriceType == false">
item.getSpecialPriceType() || item.getSplitCustomPriceType() || item.getSpecialCommission() || item.getChannelManualPricing()
AND o.order_id not in(
select
it.order_id
from ecw_order_item it
where it.order_id = o.order_id
and (it.special_price_type = true or it.split_custom_price_type = true or it.special_commission = true or it.channel_manual_pricing = true))
</if>
<if test="query.specialPriceType != null and query.specialPriceType == true">
item.getSpecialPriceType() || item.getSplitCustomPriceType() || item.getSpecialCommission() || item.getChannelManualPricing()
AND o.order_id in(
select
it.order_id
from ecw_order_item it
where it.order_id = o.order_id
and (it.special_price_type = true or it.split_custom_price_type = true or it.special_commission = true or it.channel_manual_pricing = true))
</if>
<if test="query.airShipmentList != null and query.airShipmentList.size() > 0"> <if test="query.airShipmentList != null and query.airShipmentList.size() > 0">
<if test="query.airShipmentList.size() == 1"> <if test="query.airShipmentList.size() == 1">
<foreach item='airShipment' index="index" collection='query.airShipmentList'> <foreach item='airShipment' index="index" collection='query.airShipmentList'>
......
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