attiya/ebike-plus
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除无关字段

Browse Source
This commit is contained in:
yanglei 2025-12-31 10:27:03 +08:00
parent a8682bd08d
commit 13346d3da5
8 changed files with 2 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ebike-payment/src/main/java/com/cdzy/payment/model/entity/EbikeOrder.java
View File

@ -98,16 +98,6 @@ public class EbikeOrder implements Serializable {
*/
private Integer paymentMethod;
/**
* 使用卡券ID集合（JSON数组）
*/
private String couponIds;
/**
* 优惠明细（结构化存储，便于对账）
*/
private String discountDetails;
/**
* 起步费用
*/
@ -153,10 +143,6 @@ public class EbikeOrder implements Serializable {
*/
private BigDecimal helmetManagementFee;
/**
* 地理位置GeoHash编码（用于区域优惠分析）
*/
private String geoHash;
/**
* 骑行起始点
@ -174,16 +160,6 @@ public class EbikeOrder implements Serializable {
@JsonDeserialize(using = PointDeserializer.class)
private Point endLocation;
/**
* 取消时间
*/
private LocalDateTime cancelTime;
/**
* 是否临时锁车 0-未临时锁车 -1-临时锁车
*/
private Integer tempLock;
/**
* 创建人

5
ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportDto.java
View File

@ -78,11 +78,6 @@ public class EbikeFaultReportDto {
*/
private Long orderId;
/**
* 工单ID
*/
private Long reviewId;
/**
* 附件文件列表
*/

5
ebike-user/src/main/java/com/cdzy/user/model/dto/EbikeFaultReportQueryDto.java
View File

@ -18,11 +18,6 @@ public class EbikeFaultReportQueryDto {
@NotBlank(message = "车辆编号不能为空")
private String bikeCode;
/**
* 工单ID
*/
private Long reviewId;
/**
* 故障部件
*/

5
ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeFaultReport.java
View File

@ -89,11 +89,6 @@ public class EbikeFaultReport implements Serializable {
*/
private Long orderId;
/**
* 工单ID
*/
private Long reviewId;
/**
* 创建人
*/

26
ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrder.java
View File

@ -98,16 +98,6 @@ public class EbikeOrder implements Serializable {
*/
private Integer paymentMethod;
/**
* 使用卡券ID集合（JSON数组）
*/
private String couponIds;
/**
* 优惠明细（结构化存储，便于对账）
*/
private String discountDetails;
/**
* 起步费用
*/
@ -153,11 +143,6 @@ public class EbikeOrder implements Serializable {
*/
private BigDecimal helmetManagementFee;
/**
* 地理位置GeoHash编码（用于区域优惠分析）
*/
private String geoHash;
/**
* 骑行起始点
*/
@ -174,17 +159,6 @@ public class EbikeOrder implements Serializable {
@JsonDeserialize(using = PointDeserializer.class)
private Point endLocation;
/**
* 取消时间
*/
private LocalDateTime cancelTime;
/**
* 是否临时锁车 0-未临时锁车 -1-临时锁车
*/
private Integer tempLock;
/**
* 创建人
*/

5
ebike-user/src/main/java/com/cdzy/user/model/entity/EbikeOrderDetail.java
View File

@ -63,11 +63,6 @@ public class EbikeOrderDetail implements Serializable {
*/
private BigDecimal detailAmount;
/**
* 优惠券Id
*/
private String couponId;
/**
* 创建人
*/

7
ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeFaultReportServiceImpl.java
View File

@ -78,7 +78,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
.location(ebikeFaultReportDto.getLocation())
.handleStatus(EbikeFaultReportStatus.PENDING)
.orderId(ebikeFaultReportDto.getOrderId())
.reviewId(ebikeFaultReportDto.getReviewId())
.createBy(ebikeFaultReportDto.getUserId())
.build();
this.save(userFaultReport);
@ -200,7 +199,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
.reportSource(ebikeFaultReportDto.getReportSource())
.location(ebikeFaultReportDto.getLocation())
.orderId(ebikeFaultReportDto.getOrderId())
.reviewId(ebikeFaultReportDto.getReviewId())
.updateBy(ebikeFaultReportDto.getUserId())
.build();
this.updateById(userFaultReport);
@ -297,7 +295,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
.reportSource(report.getReportSource())
.location(report.getLocation())
.orderId(report.getOrderId())
.reviewId(report.getReviewId())
.attachmentFiles(fileInfo)
.build();
}
@ -308,9 +305,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
QueryWrapper query = QueryWrapper.create()
.where(EBIKE_FAULT_REPORT.BIKE_CODE.eq(ebikeFaultReportQueryDto.getBikeCode()))
.and(EBIKE_FAULT_REPORT.IS_DELETED.eq(false));
if (ebikeFaultReportQueryDto.getReviewId() != null) {
query.and(EBIKE_FAULT_REPORT.REVIEW_ID.eq(ebikeFaultReportQueryDto.getReviewId()));
}
List<EbikeFaultReport> reports = this.list(query);
if (reports.isEmpty()) {
return Collections.emptyList();
@ -359,7 +353,6 @@ public class EbikeFaultReportServiceImpl extends ServiceImpl<EbikeFaultReportMap
.reportSource(report.getReportSource())
.location(report.getLocation())
.orderId(report.getOrderId())
.reviewId(report.getReviewId())
.attachmentFiles(fileDtos)
.build();
}).collect(Collectors.toList());

5
ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
View File

@ -108,7 +108,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
.outOfParkingAreaFee(bikeInfo.getOutOfParkingAreaFee())
.outOfServiceAreaFee(bikeInfo.getOutOfServiceAreaFee())
.maxFeeAmount(bikeInfo.getMaxFeeAmount())
.createTime(LocalDateTime.now())
.createBy(userId)
.build();
save(order);
// 尝试开锁
@ -120,7 +120,6 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
EbikeOrder orders = EbikeOrder.builder()
.orderId(order.getOrderId())
.orderStatus(OrderStatus.IN_PROGRESS)
.updateTime(LocalDateTime.now())
.build();
updateById(orders);
return getById(order.getOrderId());
@ -374,7 +373,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
.detailDescription(orderDetailType.getName())
.detailName(detailName)
.detailAmount(amount)
.couponId(order.getCouponIds())
.createBy(order.getUserId())
.build();
}