sugus/aircraft-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：调整错误的字段命名和字段类型定义

Browse Source
This commit is contained in:
chenxiky 2025-07-12 22:32:49 +08:00
parent ffa117c874
commit 00b08cd3c8
9 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderDetail.java
View File

@ -41,7 +41,7 @@ public class OrderDetail extends BaseEntity {
/**
* 载人数量
*/
private String personConut;
private String personCount;
/**
* 操作员ID

4
aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java
View File

@ -83,12 +83,12 @@ public class OrderMain extends BaseEntity {
/**
* 结算状态
*/
private Boolean settlementStatus;
private Integer settlementStatus;
/**
* 订单主单状态
*/
private Boolean mainOrderStatus;
private Integer mainOrderStatus;
/**
* 下单时间

4
aircraft-system/src/main/java/com/aircraft/modules/order/domain/SettlementDetail.java
View File

@ -88,12 +88,12 @@ public class SettlementDetail extends BaseEntity {
/**
* 结算状态
*/
private Boolean settlementStatus;
private Integer settlementStatus;
/**
* 订单主单状态
*/
private Boolean mainOrderStatus;
private Integer mainOrderStatus;
/**
* 下单时间

2
aircraft-system/src/main/java/com/aircraft/modules/order/mapper/AttachmentMaterialMapper.java
View File

@ -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;
/**
* <p>
@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author cli
* @since 2025-07-10
*/
@Repository
public interface AttachmentMaterialMapper extends BaseMapper<AttachmentMaterial> {
}

2
aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderDetailMapper.java
View File

@ -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<OrderDetail> {
List<OrderDetail> getOrderDetailsByOrderIds(List<Long> orderIds);

2
aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderMainMapper.java
View File

@ -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;
/**
* <p>
@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author cli
* @since 2025-07-10
*/
@Repository
public interface OrderMainMapper extends BaseMapper<OrderMain> {
}

2
aircraft-system/src/main/java/com/aircraft/modules/order/mapper/OrderOperatorMapper.java
View File

@ -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;
/**
* <p>
@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author cli
* @since 2025-07-10
*/
@Repository
public interface OrderOperatorMapper extends BaseMapper<OrderOperator> {
}

2
aircraft-system/src/main/java/com/aircraft/modules/order/mapper/SettlementDetailMapper.java
View File

@ -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;
/**
* <p>
@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author cli
* @since 2025-07-10
*/
@Repository
public interface SettlementDetailMapper extends BaseMapper<SettlementDetail> {
}

4
aircraft-system/src/main/resources/mapper/order/OrderDetailMapper.xml
View File

@ -6,7 +6,7 @@
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="order_id" property="orderId" jdbcType="BIGINT"/>
<result column="device_id" property="deviceId" jdbcType="BIGINT"/>
<result column="person_conut" property="personConut" jdbcType="VARCHAR"/>
<result column="person_count" property="personCount" jdbcType="VARCHAR"/>
<result column="operator_id" property="operatorId" jdbcType="BIGINT"/>
<result column="order_item_status" property="orderItemStatus" jdbcType="INTEGER"/>
<result column="create_by" property="createBy" jdbcType="VARCHAR"/>
@ -22,7 +22,7 @@
id,
order_id,
device_id,
person_conut,
person_count,
operator_id,
order_item_status,
create_by,