Skip to content

J
jiedao-api-boot-master
Commit e02117d8 authored by Smile's avatar Smile Committed by wux
Browse files
Options

bug214 【(app/h5)首页/我的订单各个tab】查询订单接口status字段返回32时，前端无状态值显示

parent c24bcf53
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 0 deletions
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/order/OrderMapper.java
View file @ e02117d8
...@@ -1708,6 +1708,60 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -1708,6 +1708,60 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
"<when test = 'query.customerId != null'>", "<when test = 'query.customerId != null'>",
"AND o.`customer_id` = #{query.customerId}", "AND o.`customer_id` = #{query.customerId}",
"</when>", "</when>",
"<when test='query.dynamicStatusList != null and query.dynamicStatusList.size()>0'>",
"AND (1 != 1",
"<foreach item='status' index='index' collection='query.dynamicStatusList'>",
"<choose>",
"<when test='status == 12325'>",
" or (o.`status` = 12 and o.`shipment_State` = 325)",
"</when>",
"<when test='status == 10501'>",
" or (o.`status` = 5 AND o.air_shipment = 1 and o.abnormal_state = 0 and o.audit_type = 0 and o.transport_id = 3)",
"</when>",
"<when test='status == 10502'>",
" or (o.`status` = 5 AND o.air_shipment in(2,3) and o.abnormal_state = 0 and o.audit_type = 0 and o.transport_id = 3)",
"</when>",
"<when test='status == 10503'>",
" or (o.`status` = 5 AND o.air_shipment = 4 and o.transport_id = 3)",
"</when>",
"<when test='status == 10504'>",
" or (",
" o.`status` = 5 and o.abnormal_state = 0 and o.audit_type = 0",
" and (",
" (o.transport_id = 3 AND o.air_shipment in(2,3,4))",
" or",
" (o.transport_id = 1 AND o.air_shipment in(0,2,3,4))",
" )",
" )",
"</when>",
"<when test='status == 132411'>",
" or (o.`status` = 32 AND o.shipment_State = 411 and o.transport_id = 3)",
"</when>",
"<when test='status == 132412'>",
" or (o.`status` = 32 AND o.shipment_State = 412 and o.transport_id = 3)",
"</when>",
"<when test='status == 132409'>",
" or (o.`status` = 32 AND o.shipment_State = 409 and o.transport_id = 3)",
"</when>",
"<when test='status == 118428'>",
" or (o.`status` = 32 AND o.shipment_State = 428 and o.transport_id = 3)",
"</when>",
"<when test='status == 16'>",
" or (o.`status` = #{status} AND o.`pick_state` = 0)",
"</when>",
"<when test='status == 20'>",
" or o.`pick_state` = 2",
"</when>",
"<when test='status == 21'>",
" or o.`pick_state` = 1",
"</when>",
"<otherwise>",
" or o.`status` = #{status}",
"</otherwise>",
" </choose>",
"</foreach>",
")",
"</when>",
"</script>" "</script>"
}) })
IPage<OrderBackPageVO> dynamicOrderPage(@Param("mpPage") IPage<OrderBackPageVO> mpPage, @Param("query") OrderQueryVO query); IPage<OrderBackPageVO> dynamicOrderPage(@Param("mpPage") IPage<OrderBackPageVO> mpPage, @Param("query") OrderQueryVO query);
...@@ -2426,6 +2480,60 @@ public interface OrderMapper extends AbstractMapper<OrderDO> { ...@@ -2426,6 +2480,60 @@ public interface OrderMapper extends AbstractMapper<OrderDO> {
"<when test = 'query.containerNumber != null and query.containerNumber != \"\" '>", "<when test = 'query.containerNumber != null and query.containerNumber != \"\" '>",
"AND o.`container_number` = #{query.containerNumber}", "AND o.`container_number` = #{query.containerNumber}",
"</when>", "</when>",
"<when test='query.dynamicStatusList != null and query.dynamicStatusList.size()>0'>",
"AND (1 != 1",
"<foreach item='status' index='index' collection='query.dynamicStatusList'>",
"<choose>",
"<when test='status == 12325'>",
" or (o.`status` = 12 and o.`shipment_State` = 325)",
"</when>",
"<when test='status == 10501'>",
" or (o.`status` = 5 AND o.air_shipment = 1 and o.abnormal_state = 0 and o.audit_type = 0 and o.transport_id = 3)",
"</when>",
"<when test='status == 10502'>",
" or (o.`status` = 5 AND o.air_shipment in(2,3) and o.abnormal_state = 0 and o.audit_type = 0 and o.transport_id = 3)",
"</when>",
"<when test='status == 10503'>",
" or (o.`status` = 5 AND o.air_shipment = 4 and o.transport_id = 3)",
"</when>",
"<when test='status == 10504'>",
" or (",
" o.`status` = 5 and o.abnormal_state = 0 and o.audit_type = 0",
" and (",
" (o.transport_id = 3 AND o.air_shipment in(2,3,4))",
" or",
" (o.transport_id = 1 AND o.air_shipment in(0,2,3,4))",
" )",
" )",
"</when>",
"<when test='status == 132411'>",
" or (o.`status` = 32 AND o.shipment_State = 411 and o.transport_id = 3)",
"</when>",
"<when test='status == 132412'>",
" or (o.`status` = 32 AND o.shipment_State = 412 and o.transport_id = 3)",
"</when>",
"<when test='status == 132409'>",
" or (o.`status` = 32 AND o.shipment_State = 409 and o.transport_id = 3)",
"</when>",
"<when test='status == 118428'>",
" or (o.`status` = 32 AND o.shipment_State = 428 and o.transport_id = 3)",
"</when>",
"<when test='status == 16'>",
" or (o.`status` = #{status} AND o.`pick_state` = 0)",
"</when>",
"<when test='status == 20'>",
" or o.`pick_state` = 2",
"</when>",
"<when test='status == 21'>",
" or o.`pick_state` = 1",
"</when>",
"<otherwise>",
" or o.`status` = #{status}",
"</otherwise>",
" </choose>",
"</foreach>",
")",
"</when>",
"</script>" "</script>"
}) })
IPage<OrderBackPageVO> receivedOrderPage(@Param("mpPage") IPage<OrderBackPageVO> mpPage, @Param("query") OrderQueryVO query); IPage<OrderBackPageVO> receivedOrderPage(@Param("mpPage") IPage<OrderBackPageVO> mpPage, @Param("query") OrderQueryVO query);
......
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