diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderDetail.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderDetail.java index 18459f0..a2af44e 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderDetail.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderDetail.java @@ -41,7 +41,7 @@ public class OrderDetail extends BaseEntity { /** * 载人数量 */ - private String personConut; + private String personCount; /** * 操作员ID diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java index 77ff06d..95e18c5 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java @@ -83,12 +83,12 @@ public class OrderMain extends BaseEntity { /** * 结算状态 */ - private Boolean settlementStatus; + private Integer settlementStatus; /** * 订单主单状态 */ - private Boolean mainOrderStatus; + private Integer mainOrderStatus; /** * 下单时间 diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java index 3d0f730..571612c 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java @@ -88,12 +88,12 @@ public class SettlementDetail extends BaseEntity { /** * 结算状态 */ - private Boolean settlementStatus; + private Integer settlementStatus; /** * 订单主单状态 */ - private Boolean mainOrderStatus; + private Integer mainOrderStatus; /** * 下单时间 diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/AttachmentMaterialMapper.java b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/AttachmentMaterialMapper.java index 75aeeb5..6ad7919 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/AttachmentMaterialMapper.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/AttachmentMaterialMapper.java @@ -2,6 +2,7 @@ package com.aircraft.modules.order.mapper; import com.aircraft.modules.system.domain.AttachmentMaterial; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author cli * @since 2025-07-10 */ +@Repository public interface AttachmentMaterialMapper extends BaseMapper { } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderDetailMapper.java b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderDetailMapper.java index 02d713c..02a9b4c 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderDetailMapper.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderDetailMapper.java @@ -2,6 +2,7 @@ package com.aircraft.modules.order.mapper; import com.aircraft.modules.order.domain.OrderDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; import java.util.List; @@ -13,6 +14,7 @@ import java.util.List; * @author cli * @since 2025-07-10 */ +@Repository public interface OrderDetailMapper extends BaseMapper { List getOrderDetailsByOrderIds(List orderIds); diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderMainMapper.java b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderMainMapper.java index 3678aab..db633ce 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderMainMapper.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderMainMapper.java @@ -2,6 +2,7 @@ package com.aircraft.modules.order.mapper; import com.aircraft.modules.order.domain.OrderMain; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author cli * @since 2025-07-10 */ +@Repository public interface OrderMainMapper extends BaseMapper { } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderOperatorMapper.java b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderOperatorMapper.java index 2f50e65..55526b1 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderOperatorMapper.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderOperatorMapper.java @@ -2,6 +2,7 @@ package com.aircraft.modules.order.mapper; import com.aircraft.modules.order.domain.OrderOperator; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author cli * @since 2025-07-10 */ +@Repository public interface OrderOperatorMapper extends BaseMapper { } diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/SettlementDetailMapper.java b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/SettlementDetailMapper.java index 5fcaedb..7436715 100644 --- a/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/SettlementDetailMapper.java +++ b/aircraft-system/src/main/java/com/aircraft/modules/order/mapper/SettlementDetailMapper.java @@ -2,6 +2,7 @@ package com.aircraft.modules.order.mapper; import com.aircraft.modules.order.domain.SettlementDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; /** *

@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author cli * @since 2025-07-10 */ +@Repository public interface SettlementDetailMapper extends BaseMapper { } diff --git a/aircraft-system/src/main/resources/mapper/order/OrderDetailMapper.xml b/aircraft-system/src/main/resources/mapper/order/OrderDetailMapper.xml index 8f72b20..d56426d 100644 --- a/aircraft-system/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/aircraft-system/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -6,7 +6,7 @@ - + @@ -22,7 +22,7 @@ id, order_id, device_id, - person_conut, + person_count, operator_id, order_item_status, create_by,