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

Compare commits

base: attiya:8dd79d47bf38ae5bb94ace269090902f75c3a89b632b40b6d6443fcaa9e75082
Branches Tags
attiya:main
attiya:dev
..
compare: attiya:3393089eee0a292f14ca6a33aec68a76a8db4544420244358e5b19a0a5a40b7a
Branches Tags
attiya:main
attiya:dev

No commits in common. "8dd79d47bf38ae5bb94ace269090902f75c3a89b632b40b6d6443fcaa9e75082" and "3393089eee0a292f14ca6a33aec68a76a8db4544420244358e5b19a0a5a40b7a" have entirely different histories.
8dd79d47bf ... 3393089eee

5 changed files with 3 additions and 34 deletions
Show Stats Expand all files Collapse all files

8
ebike-feign/src/main/java/com/ebike/feign/model/dto/FeignEbikeUserBikeInfo.java
View File

@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.geom.Polygon;
import java.io.Serial;
@ -12,7 +11,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
/**
* 实体类。
* 实体类。
*
* @author attiya
* @since 2025-10-21
@ -104,9 +103,4 @@ public class FeignEbikeUserBikeInfo implements Serializable {
*/
private Polygon regionPolygon;
/**
* 车辆当前位置
*/
private Point location;
}

14
ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeUserBikeInfo.java
View File

@ -1,8 +1,5 @@
package com.cdzy.operations.model.dto;
import com.cdzy.operations.handler.PointDeserializer;
import com.cdzy.operations.handler.PointSerializer;
import com.cdzy.operations.handler.PointTypeHandler;
import com.cdzy.operations.handler.PolygonDeserializer;
import com.cdzy.operations.handler.PolygonSerializer;
import com.cdzy.operations.handler.PolygonTypeHandler;
@ -13,7 +10,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.geom.Polygon;
import java.io.Serial;
@ -21,7 +17,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
/**
* 实体类。
* 实体类。
*
* @author attiya
* @since 2025-10-21
@ -116,11 +112,5 @@ public class EbikeUserBikeInfo implements Serializable {
@JsonDeserialize(using = PolygonDeserializer.class)
private Polygon regionPolygon;
/**
* 当前位置
*/
@Column(typeHandler = PointTypeHandler.class)
@JsonSerialize(using = PointSerializer.class)
@JsonDeserialize(using = PointDeserializer.class)
private Point location;
}

2
ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
View File

@ -450,7 +450,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
.helmetManagementFee(configurations.getHelmetManagementFee())
.soc(soc)
.regionPolygon(region.getRegionPolygon())
.location(info.getLocation())
.build();
} else {
EbikeUserBikeInfo userBikeInfo = EbikeUserBikeInfo.builder()
@ -469,7 +468,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
.helmetManagementFee(configurations.getHelmetManagementFee())
.soc(soc)
.regionPolygon(region.getRegionPolygon())
.location(info.getLocation())
.build();
if (specialBillingConfiguration.getType() == SpecialBillingConfigurationType.DAY) {
query.clear();

12
ebike-user/src/main/java/com/cdzy/user/model/vo/EbikeBikeInfoVo.java
View File

@ -1,8 +1,5 @@
package com.cdzy.user.model.vo;
import com.cdzy.user.handler.PointDeserializer;
import com.cdzy.user.handler.PointSerializer;
import com.cdzy.user.handler.PointTypeHandler;
import com.cdzy.user.handler.PolygonDeserializer;
import com.cdzy.user.handler.PolygonSerializer;
import com.cdzy.user.handler.PolygonTypeHandler;
@ -13,7 +10,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.geom.Polygon;
import java.io.Serializable;
@ -115,12 +111,4 @@ public class EbikeBikeInfoVo implements Serializable {
@JsonSerialize(using = PolygonSerializer.class)
@JsonDeserialize(using = PolygonDeserializer.class)
private Polygon regionPolygon;
/**
* 车辆当前位置
*/
@Column(typeHandler = PointTypeHandler.class)
@JsonSerialize(using = PointSerializer.class)
@JsonDeserialize(using = PointDeserializer.class)
private Point location;
}

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

@ -248,7 +248,6 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
.noParkingZoneFee(source.getNoParkingZoneFee())
.helmetManagementFee(source.getHelmetManagementFee())
.regionPolygon(source.getRegionPolygon())
.location(source.getLocation())
.build();
}