diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java index 22c9f008..4b86f498 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java @@ -400,8 +400,8 @@ public class EbikeRegionController { /** * 设置用户所属运营区 * - * @param reqUserOperateDto - * @return + * @param reqUserOperateDto 信息 + * @return 结果 */ @PostMapping("setUserOperate") public JsonResult setUserOperate(@RequestBody ReqUserOperateDto reqUserOperateDto) { @@ -431,8 +431,8 @@ public class EbikeRegionController { /** * 删除用户所属运营区 * - * @param staffId - * @return + * @param staffId 员工id + * @return 结果 */ @PostMapping("delUserOperate") public JsonResult delUserOperate(@RequestParam("staffId") Long staffId) { diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java index 7ca8e333..e3653ea7 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java @@ -115,4 +115,15 @@ public class ResEbikeSiteRegionInfoDto { private String describe; + + /** + * 借车单量 + */ + private Integer borrowingOrder; + + /** + * 还车胆量 + */ + private Integer returnOrder; + } 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..6a554775 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 @@ -105,6 +105,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