From 913e48d868fb30fd65b798a399d8430823e276ea Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Thu, 15 May 2025 10:23:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AB=99=E7=82=B9=E8=BF=98=E8=BD=A6?= =?UTF-8?q?=E3=80=81=E5=80=9F=E8=BD=A6=E5=8D=95=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/ResEbikeSiteRegionPageDto.java | 12 ++++++++++++ .../ebikeoperate/model/pojo/EbikeSiteRegion.java | 12 ++++++++++++ .../orders/service/impl/UserOrdersServiceImpl.java | 1 + 3 files changed, 25 insertions(+) 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 Date: Thu, 15 May 2025 10:23:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AB=99=E7=82=B9=E8=BF=98=E8=BD=A6?= =?UTF-8?q?=E3=80=81=E5=80=9F=E8=BD=A6=E5=8D=95=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/dto/response/ResEbikeSiteRegionPageDto.java | 1 - 1 file changed, 1 deletion(-) 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 97b707ac..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 @@ -1,7 +1,6 @@ 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; From 050c4dd35c4ae0a77c89c4dad1726d5421aead94 Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Thu, 15 May 2025 10:25:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=AB=99=E7=82=B9=E8=BF=98=E8=BD=A6?= =?UTF-8?q?=E3=80=81=E5=80=9F=E8=BD=A6=E5=8D=95=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeRegionController.java | 8 ++++---- .../model/dto/response/ResEbikeSiteRegionInfoDto.java | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) 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; + }