From a6a0da11c712c4cc2b769ee7e3478ec5a83a947e1c0b6b9ff6c538f4f00f7d9d Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Fri, 24 Oct 2025 15:03:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=8C=BA=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E8=AE=A1=E8=B4=B9=E9=85=8D=E7=BD=AE=EF=BC=9A=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E5=91=A8=E5=87=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeRegionController.java | 13 ++--- .../EbikeSpecialBillingConfiguration.java | 8 --- ...ikeSpecialBillingConfigurationService.java | 8 +++ ...pecialBillingConfigurationServiceImpl.java | 53 +++++++++++++++---- 4 files changed, 54 insertions(+), 28 deletions(-) diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeRegionController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeRegionController.java index 2f8119c..bfbf100 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeRegionController.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeRegionController.java @@ -25,7 +25,6 @@ import java.util.List; import static com.cdzy.operations.model.entity.table.EbikeDefaultBillingConfigurationTableDef.EBIKE_DEFAULT_BILLING_CONFIGURATION; import static com.cdzy.operations.model.entity.table.EbikeRegionTableDef.EBIKE_REGION; -import static com.cdzy.operations.model.entity.table.EbikeSpecialBillingConfigurationTableDef.EBIKE_SPECIAL_BILLING_CONFIGURATION; /** * 运营区域表 控制层。 @@ -203,10 +202,8 @@ public class EbikeRegionController { */ @GetMapping("getSpecialConfiguration") public JsonResult getSpecialConfiguration(@RequestParam Long regionId) { - QueryWrapper queryWrapper = QueryWrapper.create() - .where(EBIKE_SPECIAL_BILLING_CONFIGURATION.REGION_ID.eq(regionId)); - EbikeSpecialBillingConfigurationDto configurationDto = specialBillingConfigurationService.getMapper().selectOneWithRelationsByQueryAs(queryWrapper, EbikeSpecialBillingConfigurationDto.class); - return JsonResult.success(configurationDto); + EbikeSpecialBillingConfigurationDto configuration = specialBillingConfigurationService.info(regionId); + return JsonResult.success(configuration); } /** @@ -229,9 +226,7 @@ public class EbikeRegionController { */ @GetMapping("getOperationConfiguration") public JsonResult getOperationConfiguration(@RequestParam Long regionId) { - QueryWrapper queryWrapper = QueryWrapper.create() - .where(EBIKE_SPECIAL_BILLING_CONFIGURATION.REGION_ID.eq(regionId)); - EbikeSpecialBillingConfigurationDto configurationDto = specialBillingConfigurationService.getMapper().selectOneWithRelationsByQueryAs(queryWrapper, EbikeSpecialBillingConfigurationDto.class); - return JsonResult.success(configurationDto); + EbikeSpecialBillingConfigurationDto configuration = specialBillingConfigurationService.info(regionId); + return JsonResult.success(configuration); } } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialBillingConfiguration.java b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialBillingConfiguration.java index 764f0cc..f3a3f69 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialBillingConfiguration.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/model/entity/EbikeSpecialBillingConfiguration.java @@ -2,7 +2,6 @@ package com.cdzy.operations.model.entity; 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; @@ -12,7 +11,6 @@ import lombok.NoArgsConstructor; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.List; /** * 实体类。 @@ -51,10 +49,4 @@ public class EbikeSpecialBillingConfiguration implements Serializable { private Long createdBy; - @RelationOneToMany(selfField = "regionId",targetField = "regionId") - List dayConfigs; - - @RelationOneToMany(selfField = "regionId",targetField = "regionId") - List timeConfigs; - } diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeSpecialBillingConfigurationService.java b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeSpecialBillingConfigurationService.java index 4bc49e4..ffbc514 100644 --- a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeSpecialBillingConfigurationService.java +++ b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeSpecialBillingConfigurationService.java @@ -1,5 +1,6 @@ package com.cdzy.operations.service; +import com.cdzy.operations.model.dto.EbikeSpecialBillingConfigurationDto; import com.cdzy.operations.model.vo.EbikeSpecialBillingConfigurationVo; import com.mybatisflex.core.service.IService; import com.cdzy.operations.model.entity.EbikeSpecialBillingConfiguration; @@ -17,4 +18,11 @@ public interface EbikeSpecialBillingConfigurationService extends IService implements EbikeSpecialBillingConfigurationService{ +public class EbikeSpecialBillingConfigurationServiceImpl extends ServiceImpl implements EbikeSpecialBillingConfigurationService { @Resource @@ -45,7 +50,7 @@ public class EbikeSpecialBillingConfigurationServiceImpl extends ServiceImpl timeConfigs = configurationVo.getTimeConfigs(); - if (timeConfigs == null || timeConfigs.isEmpty()){ + if (timeConfigs == null || timeConfigs.isEmpty()) { throw new EbikeException("选择高峰时段计费后必须配置时段费用"); } + queryWrapper.clear(); + queryWrapper.where(EBIEK_SPECIAL_TIME.REGION_ID.eq(regionId)); timeMapper.deleteByQuery(queryWrapper); List list = new ArrayList<>(); - for (EbiekSpecialTimeVo timeConfig : timeConfigs){ + for (EbiekSpecialTimeVo timeConfig : timeConfigs) { EbiekSpecialTime time = EbiekSpecialTime.builder() .regionId(regionId) .startTime(timeConfig.getStartTime()) @@ -76,12 +84,15 @@ public class EbikeSpecialBillingConfigurationServiceImpl extends ServiceImpl dayConfigs = configurationVo.getDayConfigs(); - if (dayConfigs == null || dayConfigs.isEmpty()){ + if (dayConfigs == null || dayConfigs.isEmpty()) { throw new EbikeException("选择高峰日计费后必须配置高峰日费用"); } + + queryWrapper.clear(); + queryWrapper.where(EBIEK_SPECIAL_DAY.REGION_ID.eq(regionId)); dayMapper.deleteByQuery(queryWrapper); List list = new ArrayList<>(); - for (EbiekSpecialDayVo dayConfig : dayConfigs){ + for (EbiekSpecialDayVo dayConfig : dayConfigs) { EbiekSpecialDay day = EbiekSpecialDay.builder() .regionId(regionId) .specialDayNum(dayConfig.getSpecialDayNum()) @@ -96,4 +107,24 @@ public class EbikeSpecialBillingConfigurationServiceImpl extends ServiceImpl days = dayMapper.selectListByQuery(queryWrapper); + + queryWrapper.clear(); + queryWrapper.where(EBIEK_SPECIAL_TIME.REGION_ID.eq(regionId)); + List times = timeMapper.selectListByQuery(queryWrapper); + specialBillingConfiguration.setDayConfigs(days); + specialBillingConfiguration.setTimeConfigs(times); + return specialBillingConfiguration; + } }