Merge branch 'main' of http://47.109.71.130:3000/attiya/ebike-share

ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java

@@ -400,8 +400,8 @@ public class EbikeRegionController {
     /**
      * 设置用户所属运营区
      *
-     * @param reqUserOperateDto
+     * @param reqUserOperateDto 信息
-     * @return
+     * @return 结果
      */
     @PostMapping("setUserOperate")
     public JsonResult<?> setUserOperate(@RequestBody ReqUserOperateDto reqUserOperateDto) {
@@ -431,8 +431,8 @@ public class EbikeRegionController {
     /**
      * 删除用户所属运营区
      *
-     * @param staffId
+     * @param staffId 员工id
-     * @return
+     * @return 结果
      */
     @PostMapping("delUserOperate")
     public JsonResult<?> delUserOperate(@RequestParam("staffId") Long staffId) {

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;
+
 }

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<EbikePoint> points;
 }

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;
+
 }

ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java

@@ -133,6 +133,7 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
         String stringBuilder = resGpsDto.getLongitude() + "," + resGpsDto.getLatitude();
         userOrders.setRidePoint(stringBuilder);
         userOrdersMapper.insert(userOrders);
+        //处理车辆
         return userOrders.getOrderId();
     }