From 89b4d075ebce5b5a184d0025ec24100da3159a99 Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Tue, 20 May 2025 16:39:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9:=E8=BF=90=E8=90=A5=E5=8C=BA?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=8A=B6=E6=80=81=E7=BB=9F=E4=B8=80=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=AD=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/model/rsp/FeignEbikeRegionDto.java | 13 +- .../model/rsp/FeignEbikeSysRoperateset.java | 219 ++++++++++++++++++ .../controller/EbikeRegionController.java | 20 +- .../enums/EbikeRegionInOperation.java | 4 +- .../dto/response/ResOperationRegionInfo.java | 4 + .../model/pojo/EbikeOperationRegion.java | 17 +- .../impl/EbikeOperationRegionServiceImpl.java | 10 +- .../impl/EbikeSiteRegionServiceImpl.java | 7 +- .../orders/enums/EbikeRegionInOperation.java | 4 +- .../service/impl/UserOrdersServiceImpl.java | 6 +- 10 files changed, 252 insertions(+), 52 deletions(-) create mode 100644 ebike-feign/src/main/java/com/ebike/feign/model/rsp/FeignEbikeSysRoperateset.java diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/rsp/FeignEbikeRegionDto.java b/ebike-feign/src/main/java/com/ebike/feign/model/rsp/FeignEbikeRegionDto.java index 5e217cbb..ad3635a6 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/model/rsp/FeignEbikeRegionDto.java +++ b/ebike-feign/src/main/java/com/ebike/feign/model/rsp/FeignEbikeRegionDto.java @@ -1,18 +1,10 @@ package com.ebike.feign.model.rsp; -import com.mybatisflex.annotation.Column; -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.RelationOneToMany; -import com.mybatisflex.annotation.Table; -import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.List; /** * 实体类。 @@ -83,9 +75,6 @@ public class FeignEbikeRegionDto implements Serializable { */ private Long updateStaff; - /** - * 运营区是否运营中：1-是，0-否 - */ - private Integer inOperation; + private FeignEbikeSysRoperateset sysRoperateset; } diff --git a/ebike-feign/src/main/java/com/ebike/feign/model/rsp/FeignEbikeSysRoperateset.java b/ebike-feign/src/main/java/com/ebike/feign/model/rsp/FeignEbikeSysRoperateset.java new file mode 100644 index 00000000..d0546e5d --- /dev/null +++ b/ebike-feign/src/main/java/com/ebike/feign/model/rsp/FeignEbikeSysRoperateset.java @@ -0,0 +1,219 @@ +package com.ebike.feign.model.rsp; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; + +/** + * 区域运营信息配置表 实体类。 + * + * @author user + * @since 2025-04-28 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class FeignEbikeSysRoperateset implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 区域ID + */ + private String operationRegionId; + + /** + * 是否运营;1运营中 0停止运营 + */ + private String isOperate; + + /** + * 运营类型;0默认 1按时间段运营 2按周运营 + */ + private String operateType; + + /** + * 停运公告;类型为0时，null + */ + private String stopInfo; + + /** + * 访问渠道;每一位表示一种支付，是支持，否不支持 + */ + private String channel; + + /** + * 认证条件;0默认 1实名认证 2学生认证 3无需认证 + */ + private String authCondition; + + /** + * 是否首单免费;1是 0否 + */ + private String firstFree; + + /** + * 是否首单免调度费;1是 0否 + */ + private String firstFreeDispatch; + + /** + * 免费时长不计入计费时长;1是 0否 + */ + private String freeNotRecord; + + /** + * 每日免费次数;0为不限制，大于0为免费次数使用次数 + */ + private Integer freeEveryday; + + /** + * 实名开启人脸识别;1是 0否 + */ + private String faceRecogintion; + + /** + * 是否收取押金;1是 0否 + */ + private String deposit; + + /** + * 违章罚款限制骑行;1是 0否 + */ + private String violationFine; + + /** + * 违章最低限制笔数 + */ + private Integer minVoliation; + + /** + * 地图显示附近车辆;1是 0否 + */ + private String showNearbyBike; + + /** + * 地图显示附近站点;1是 0否 + */ + private String showNearbyStation; + + /** + * 是否开启订单申诉;1是 0否 + */ + private String orderAppeal; + + /** + * 扣款优先使用余额;1是 0否 + */ + private String balancePrefer; + + /** + * 是否开启充值;1是 0否 + */ + private String enableRecharge; + + /** + * 地图车辆显示电量;1是 0否 + */ + private String showElectricity; + + /** + * 开启余额退款;1是 0否 + */ + private String balanceRefund; + + /** + * 开启车辆分账;1是 0否 + */ + private String splitBilling; + + /** + * 开启用户申请开票;1是 0否 + */ + private String userApplyIncoice; + + /** + * 用车前学习;1是 0否 + */ + private String useStudy; + + /** + * 是否显示保险信息;1是 0否 + */ + private String showEnsuracy; + + /** + * 扫码后详情显示;1是 0否 + */ + private String showDetails; + + /** + * 扫码后直接开锁;1是 0否 + */ + private String openLockDirect; + + /** + * 充值规则;默认5,10,20,50,100,200 + */ + private String rechargeRule; + + /** + * 在线客服;1开启 0关闭 + */ + private String onlineService; + + /** + * 首单免费金额 + */ + private BigDecimal firstFreeAmount; + + /** + * 申诉照片必传 + */ + private String appealPicture; + + /** + * 开票开始时间 + */ + private LocalDate issueAnInvoiceStartTime; + + /** + * 0公里申诉自动退款 + */ + private String automaticRefund; + + /** + * 余额退款自动通过 + */ + private String balanceAutomaticRefund; + + /** + * 余额退款扣减赠送金 + */ + private String deductionGift; + + /** + * 停运时间起 + */ + private LocalDateTime stopStartTime; + + /** + * 停运时间止 + */ + private LocalDateTime stopEndTime; + +} 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 22d5e2e6..3da19406 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 @@ -5,13 +5,15 @@ import com.cdzy.common.enums.Code; import com.cdzy.common.model.JsonResult; import com.cdzy.common.model.PageParam; import com.cdzy.common.model.ReqBatchRegionDto; -import com.cdzy.ebikeoperate.enums.EbikeRegionInOperation; import com.cdzy.ebikeoperate.enums.RegionLevelType; import com.cdzy.ebikeoperate.mapper.EbikeRegionLevelMapper; import com.cdzy.ebikeoperate.mapper.EbikeRegionoperationMapper; import com.cdzy.ebikeoperate.mapper.EbikeSiteTypeMapper; import com.cdzy.ebikeoperate.mapper.EbikeStaffRegionMapper; -import com.cdzy.ebikeoperate.model.dto.request.*; +import com.cdzy.ebikeoperate.model.dto.request.ReqAuthorizeOperationDto; +import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeOperationRegionDto; +import com.cdzy.ebikeoperate.model.dto.request.ReqSiteRegionDto; +import com.cdzy.ebikeoperate.model.dto.request.ReqUserOperateDto; import com.cdzy.ebikeoperate.model.dto.response.*; import com.cdzy.ebikeoperate.model.pojo.*; import com.cdzy.ebikeoperate.service.EbikeAdministrationZoneService; @@ -23,7 +25,6 @@ import com.ebike.feign.model.rsp.StaffFeign; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryMethods; import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.core.update.UpdateChain; import jakarta.annotation.Resource; import jakarta.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; @@ -145,19 +146,6 @@ public class EbikeRegionController { return JsonResult.success(list); } - /** - * 批量停止运营。 - * - * @return {@code 200} 添加成功，{@code 500} 添加失败 - */ - @PostMapping("stopOperation") - public JsonResult stopOperation(@RequestBody @Validated ReqBatchRegionDto batchRegionDto) { - UpdateChain.of(EbikeOperationRegion.class) - .set(EBIKE_OPERATION_REGION.IN_OPERATION, EbikeRegionInOperation.OUT) - .where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.in(batchRegionDto.getIds())) - .update(); - return JsonResult.success(); - } /** * 获取当前登录用户所有运营区。 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/enums/EbikeRegionInOperation.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/enums/EbikeRegionInOperation.java index a3cce949..4bf6cdd8 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/enums/EbikeRegionInOperation.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/enums/EbikeRegionInOperation.java @@ -6,6 +6,6 @@ package com.cdzy.ebikeoperate.enums; */ public interface EbikeRegionInOperation { - int IN = 1; - int OUT = 0; + String IN = "1"; + String OUT = "0"; } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResOperationRegionInfo.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResOperationRegionInfo.java index b8b97bca..7e92e91e 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResOperationRegionInfo.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResOperationRegionInfo.java @@ -1,6 +1,7 @@ package com.cdzy.ebikeoperate.model.dto.response; import com.cdzy.ebikeoperate.model.pojo.EbikePoint; +import com.cdzy.ebikeoperate.model.pojo.EbikeSysRoperateset; import com.mybatisflex.annotation.RelationOneToMany; import lombok.Data; @@ -83,6 +84,9 @@ public class ResOperationRegionInfo { @RelationOneToMany(selfField = "operationRegionId",targetField = "regionId") private List points; + @RelationOneToMany(selfField = "operationRegionId",targetField = "operationRegionId") + private EbikeSysRoperateset sysRoperateset; + /** * 级别 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeOperationRegion.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeOperationRegion.java index 78f47c77..177a0f51 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeOperationRegion.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeOperationRegion.java @@ -1,18 +1,18 @@ package com.cdzy.ebikeoperate.model.pojo; +import com.ebike.feign.model.rsp.FeignEbikeSysRoperateset; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.time.LocalDateTime; - -import java.io.Serial; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + /** * 运营区域配置表 实体类。 * @@ -86,11 +86,6 @@ public class EbikeOperationRegion implements Serializable { */ private Long updateStaff; - /** - * 运营区是否运营中：1-是，0-否 - */ - @Column(onInsertValue = "1") - private Integer inOperation; /** * 逻辑删除 @@ -103,5 +98,5 @@ public class EbikeOperationRegion implements Serializable { */ private Integer operationLevel; - + private FeignEbikeSysRoperateset sysRoperateset; } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java index 79a09693..dfa8af6a 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java @@ -4,15 +4,14 @@ import cn.dev33.satoken.stp.StpUtil; import com.cdzy.common.enums.Code; import com.cdzy.common.model.JsonResult; import com.cdzy.common.model.PageParam; +import com.cdzy.common.model.ReqBatchRegionDto; import com.cdzy.common.model.ResGPSDto; -import com.cdzy.ebikeoperate.enums.EbikeRegionInOperation; import com.cdzy.ebikeoperate.enums.RegionLevelType; import com.cdzy.ebikeoperate.mapper.EbikeAdministrationZoneMapper; import com.cdzy.ebikeoperate.mapper.EbikeOperationRegionMapper; import com.cdzy.ebikeoperate.mapper.EbikePointMapper; import com.cdzy.ebikeoperate.mapper.EbikeStaffRegionMapper; import com.cdzy.ebikeoperate.model.dto.request.ReqAuthorizeOperationDto; -import com.cdzy.common.model.ReqBatchRegionDto; import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeOperationRegionDto; import com.cdzy.ebikeoperate.model.dto.request.ReqEbikePointDto; import com.cdzy.ebikeoperate.model.dto.response.EbikeOperationRegionPageDto; @@ -49,6 +48,7 @@ import static com.cdzy.ebikeoperate.model.pojo.table.EbikePointTableDef.EBIKE_PO import static com.cdzy.ebikeoperate.model.pojo.table.EbikeRegionLevelTableDef.EBIKE_REGION_LEVEL; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSiteRegionTableDef.EBIKE_SITE_REGION; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeStaffRegionTableDef.EBIKE_STAFF_REGION; +import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSysRoperatesetTableDef.EBIKE_SYS_ROPERATESET; /** * 运营区域配置表 服务层实现。 @@ -86,7 +86,6 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl points = operationRegionDto.getPoints(); if (points != null && !points.isEmpty()) { @@ -97,13 +96,14 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation) { QueryWrapper queryWrapper = QueryWrapper.create() - .select(EBIKE_OPERATION_REGION.ALL_COLUMNS, EBIKE_ADMINISTRATION_ZONE.NAME.as(ResOperationRegionInfo::getZoneName), EBIKE_REGION_LEVEL.LEVEL_NAME) + .select(EBIKE_OPERATION_REGION.ALL_COLUMNS, EBIKE_ADMINISTRATION_ZONE.NAME.as(ResOperationRegionInfo::getZoneName), EBIKE_REGION_LEVEL.LEVEL_NAME,EBIKE_SYS_ROPERATESET.IS_OPERATE.as(ResOperationRegionInfo::getInOperation)) .leftJoin(EBIKE_REGION_LEVEL).on(EBIKE_REGION_LEVEL.LEVEL_VALUE.eq(EBIKE_OPERATION_REGION.OPERATION_LEVEL)) .leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_OPERATION_REGION.ZONE_ID)) + .leftJoin(EBIKE_SYS_ROPERATESET).on(EBIKE_SYS_ROPERATESET.OPERATION_REGION_ID.eq(EBIKE_OPERATION_REGION.OPERATION_REGION_ID)) .where(EBIKE_REGION_LEVEL.LEVEL_TYPE.eq(RegionLevelType.OPERATION)) .where(EBIKE_OPERATION_REGION.SIMPLE_NAME.eq(simpleName, StringUtils.hasText(simpleName))) .where(EBIKE_OPERATION_REGION.OPERATION_REGION_NAME.eq(regionName, StringUtils.hasText(regionName))) - .where(EBIKE_OPERATION_REGION.IN_OPERATION.eq(inOperation, Objects::nonNull)); + .where(EBIKE_SYS_ROPERATESET.IS_OPERATE.eq(inOperation, Objects::nonNull)); return this.mapper.paginateAs(pageParam.getPage(), queryWrapper, EbikeOperationRegionPageDto.class); } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java index 2988baff..f30af446 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java @@ -49,6 +49,7 @@ import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSiteImagesTableDef.EBI import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSiteRegionTableDef.EBIKE_SITE_REGION; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSiteTypeTableDef.EBIKE_SITE_TYPE; import static com.cdzy.ebikeoperate.model.pojo.table.EbikeStaffRegionTableDef.EBIKE_STAFF_REGION; +import static com.cdzy.ebikeoperate.model.pojo.table.EbikeSysRoperatesetTableDef.EBIKE_SYS_ROPERATESET; /** * 站点配置表 服务层实现。 @@ -147,9 +148,10 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl getInOperationIds(List operationRegionIds){ QueryWrapper queryWrapper = QueryWrapper.create() .select(EBIKE_OPERATION_REGION.OPERATION_REGION_ID) + .leftJoin(EBIKE_SYS_ROPERATESET).on(EBIKE_SYS_ROPERATESET.OPERATION_REGION_ID.eq(EBIKE_OPERATION_REGION.OPERATION_REGION_ID)) .where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.in(operationRegionIds)) - .where(EBIKE_OPERATION_REGION.IN_OPERATION.eq(EbikeRegionInOperation.IN)); + .where(EBIKE_SYS_ROPERATESET.IS_OPERATE.eq(EbikeRegionInOperation.IN)); return operationRegionMapper.selectListWithRelationsByQueryAs(queryWrapper,Long.class); } diff --git a/ebike-orders/src/main/java/com/cdzy/orders/enums/EbikeRegionInOperation.java b/ebike-orders/src/main/java/com/cdzy/orders/enums/EbikeRegionInOperation.java index f8e19dec..0fc441d6 100644 --- a/ebike-orders/src/main/java/com/cdzy/orders/enums/EbikeRegionInOperation.java +++ b/ebike-orders/src/main/java/com/cdzy/orders/enums/EbikeRegionInOperation.java @@ -6,6 +6,6 @@ package com.cdzy.orders.enums; */ public interface EbikeRegionInOperation { - int IN = 1; - int OUT = 0; + String IN = "1"; + String OUT = "0"; } 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 d8596a79..e8bb54b2 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 @@ -38,6 +38,7 @@ import java.time.LocalDateTime; import java.time.LocalTime; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import static com.cdzy.orders.enums.TimeDivisionCharging.TIME_SLOT; @@ -108,7 +109,8 @@ public class UserOrdersServiceImpl extends ServiceImpl data = jsonResult.getData(); - if (data == null || !data.isEmpty()) { + if (data == null || data.isEmpty()) { return JsonResult.success(List.of()); } List list = area.stream().filter(dto -> {