diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionPageDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionPageDto.java index b1943d66..97b707ac 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionPageDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionPageDto.java @@ -1,6 +1,7 @@ package com.cdzy.ebikeoperate.model.dto.response; import com.cdzy.ebikeoperate.model.pojo.EbikePoint; +import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.RelationOneToMany; import lombok.Data; @@ -105,6 +106,17 @@ public class ResEbikeSiteRegionPageDto { */ private Integer isDelete; + + /** + * 借车单量 + */ + private Integer borrowingOrder; + + /** + * 还车胆量 + */ + private Integer returnOrder; + @RelationOneToMany(selfField = "siteRegionId",targetField = "regionId") private List points; } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSiteRegion.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSiteRegion.java index 19529682..174113b4 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSiteRegion.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSiteRegion.java @@ -125,4 +125,16 @@ public class EbikeSiteRegion implements Serializable { private String describe; + /** + * 借车单量 + */ + @Column(onInsertValue = "0") + private Integer borrowingOrder; + + /** + * 还车胆量 + */ + @Column(onInsertValue = "0") + private Integer returnOrder; + } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java index 00faad69..56590f40 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java @@ -133,6 +133,7 @@ public class UserOrdersServiceImpl extends ServiceImpl