From 98857678fce3f4139845aa11c3e8563294cb2a30 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 10 四月 2026 09:54:29 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java | 6
server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java | 107 +++++++++++++-------------
server/services/src/main/java/com/doumee/dao/business/model/PricingRule.java | 10 +-
server/services/src/main/java/com/doumee/dao/vo/EstimatedDeliveryVO.java | 16 ++-
server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java | 30 +-----
server/services/src/main/java/com/doumee/dao/dto/EstimatedDeliverySaveDTO.java | 23 +++--
server/services/src/main/java/com/doumee/service/business/PricingRuleService.java | 23 +----
7 files changed, 98 insertions(+), 117 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java b/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java
index b6d5d4c..452168f 100644
--- a/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java
@@ -134,35 +134,19 @@
}
@PreventRepeat
- @ApiOperation("鏂板棰勮鏃舵晥閰嶇疆")
- @PostMapping("/estimatedDelivery/create")
+ @ApiOperation("淇濆瓨棰勮鏃舵晥閰嶇疆")
+ @PostMapping("/estimatedDelivery/save")
@RequiresPermissions("business:pricingRule:create")
- public ApiResponse createEstimatedDelivery(@RequestBody @Validated EstimatedDeliverySaveDTO request) {
- return ApiResponse.success(pricingRuleService.createEstimatedDelivery(request));
- }
-
- @PreventRepeat
- @ApiOperation("淇敼棰勮鏃舵晥閰嶇疆")
- @PostMapping("/estimatedDelivery/update")
- @RequiresPermissions("business:pricingRule:update")
- public ApiResponse updateEstimatedDelivery(@RequestBody @Validated EstimatedDeliverySaveDTO request) {
- pricingRuleService.updateEstimatedDelivery(request);
+ public ApiResponse saveEstimatedDelivery(@RequestBody @Validated EstimatedDeliverySaveDTO request) {
+ pricingRuleService.saveEstimatedDelivery(request);
return ApiResponse.success(null);
}
- @ApiOperation("鍒犻櫎棰勮鏃舵晥閰嶇疆")
- @GetMapping("/estimatedDelivery/delete/{id}")
- @RequiresPermissions("business:pricingRule:delete")
- public ApiResponse deleteEstimatedDelivery(@PathVariable Integer id) {
- pricingRuleService.deleteEstimatedDelivery(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鏌ヨ棰勮鏃舵晥閰嶇疆鍒楄〃")
+ @ApiOperation("鏌ヨ棰勮鏃舵晥閰嶇疆")
@GetMapping("/estimatedDelivery/list")
@RequiresPermissions("business:pricingRule:query")
- public ApiResponse<List<EstimatedDeliveryVO>> listEstimatedDelivery(@RequestParam Integer cityId) {
- return ApiResponse.success(pricingRuleService.listEstimatedDelivery(cityId));
+ public ApiResponse<EstimatedDeliveryVO> listEstimatedDelivery(@RequestParam Integer cityId) {
+ return ApiResponse.success(pricingRuleService.getEstimatedDelivery(cityId));
}
@PreventRepeat
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/PricingRule.java b/server/services/src/main/java/com/doumee/dao/business/model/PricingRule.java
index ccdfe7d..fa81fd9 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/PricingRule.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/PricingRule.java
@@ -52,19 +52,19 @@
@ExcelColumn(name = "绫诲瀷", index = 2, width = 10, valueMapping = "0=灏卞湴瀛樺彇瑙勫垯;1=寮傚湴瀛樺彇瑙勫垯;2=棰勮澶辨晥;3=闂ㄥ簵娉ㄥ唽鎶奸噾;4=鍒嗘垚姣斾緥;")
private Integer type;
- @ApiModelProperty(value = "鍙傛暟1锛歵ype 锛�0/1锛�= 鍏宠仈 鐗╁搧灏哄锛坈ategory type =4锛�;type 锛�2锛�= 閰嶉�侀噷绋� 锛� type (3) = 浼佷笟绫诲瀷锛�0=浼佷笟锛�1=涓汉锛夛紱type (4) = 绫诲瀷锛�0-4 浼佷笟瀵�/涓汉瀵�/浼佷笟鍙�/涓汉鍙�/閰嶉�佸憳锛�")
+ @ApiModelProperty(value = "鍙傛暟1锛歵ype 锛�0/1锛�= 鍏宠仈 鐗╁搧灏哄锛坈ategory type =4锛�;type 锛�2锛�= 榛樿 1 锛� type (3) = 浼佷笟绫诲瀷锛�0=浼佷笟锛�1=涓汉锛夛紱type (4) = 绫诲瀷锛堜紒涓�/涓汉/閰嶉�佸憳锛�")
private String fieldA;
- @ApiModelProperty(value = "鍙傛暟2锛歵ype 锛�0锛�= 鏀惰垂鍗曚环 ;type 锛�1锛�= 閰嶉�佽捣姝ラ噷绋嬪叕閲屾暟 锛泃ype 锛�2锛�= 閰嶉�佹椂闀� 锛� type (3) = 鎶奸噾锛泃ype (4) = 鍒嗘垚姣斾緥")
+ @ApiModelProperty(value = "鍙傛暟2锛歵ype 锛�0锛�= 鏀惰垂鍗曚环 ;type 锛�1锛�= 閰嶉�佽捣姝ラ噷绋嬪叕閲屾暟 锛泃ype 锛�2锛�= 璧烽�侀噷绋� km 锛� type (3) = 鎶奸噾锛泃ype (4) = 鍦扮偣绫诲瀷锛堝瘎浠剁偣/鍙栦欢鐐�/鍒嗘垚姣斾緥锛�")
private String fieldB;
- @ApiModelProperty(value = "鍙傛暟3锛歵ype 锛�1锛�= 閰嶉�佽捣姝ラ噷绋嬫瘡鍏噷鍗曚环 锛�")
+ @ApiModelProperty(value = "鍙傛暟3锛歵ype 锛�1锛�= 閰嶉�佽捣姝ラ噷绋嬫瘡鍏噷鍗曚环 锛泃ype (2) = 璧烽�佹椂闀匡紱 type (3) = 鎶奸噾锛泃ype (4) = 鍒嗘垚姣斾緥")
private String fieldC;
- @ApiModelProperty(value = "鍙傛暟4锛歵ype=1 瓒呭嚭棣栧崟閲岀▼鍏噷鏁�")
+ @ApiModelProperty(value = "鍙傛暟4锛歵ype=1 瓒呭嚭棣栧崟閲岀▼鍏噷鏁� 锛� type =2 缁�侀噷绋� km锛�")
private String fieldD;
- @ApiModelProperty(value = "鍙傛暟5锛歵ype=1 瓒呭嚭棣栧崟閲岀▼姣忓叕閲� 鍗曚环")
+ @ApiModelProperty(value = "鍙傛暟5锛歵ype=1 瓒呭嚭棣栧崟閲岀▼姣忓叕閲� 鍗曚环 锛� type =2 缁�佹椂闀�")
private String fieldE;
}
diff --git a/server/services/src/main/java/com/doumee/dao/dto/EstimatedDeliverySaveDTO.java b/server/services/src/main/java/com/doumee/dao/dto/EstimatedDeliverySaveDTO.java
index 36b97a9..eb70d14 100644
--- a/server/services/src/main/java/com/doumee/dao/dto/EstimatedDeliverySaveDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/dto/EstimatedDeliverySaveDTO.java
@@ -16,18 +16,23 @@
@ApiModel("棰勮鏃舵晥閰嶇疆淇濆瓨璇锋眰")
public class EstimatedDeliverySaveDTO implements Serializable {
- @ApiModelProperty(value = "瑙勫垯涓婚敭(淇敼鏃跺繀浼�)")
- private Integer id;
-
@ApiModelProperty(value = "鍩庡競涓婚敭", required = true, example = "1")
@NotNull(message = "鍩庡競涓婚敭涓嶈兘涓虹┖")
private Integer cityId;
- @ApiModelProperty(value = "閰嶉�侀噷绋�(鍏噷)", required = true, example = "10")
- @NotNull(message = "閰嶉�侀噷绋嬩笉鑳戒负绌�")
- private String distance;
+ @ApiModelProperty(value = "璧烽�侀噷绋�(鍏噷)", required = true, example = "10")
+ @NotNull(message = "璧烽�侀噷绋嬩笉鑳戒负绌�")
+ private String startDistance;
- @ApiModelProperty(value = "閰嶉�佹椂闀�(灏忔椂)", required = true, example = "2")
- @NotNull(message = "閰嶉�佹椂闀夸笉鑳戒负绌�")
- private String duration;
+ @ApiModelProperty(value = "璧烽�佹椂闀�", required = true, example = "2")
+ @NotNull(message = "璧烽�佹椂闀夸笉鑳戒负绌�")
+ private String startTime;
+
+ @ApiModelProperty(value = "缁�侀噷绋�(鍏噷)", required = true, example = "5")
+ @NotNull(message = "缁�侀噷绋嬩笉鑳戒负绌�")
+ private String continueDistance;
+
+ @ApiModelProperty(value = "缁�佹椂闀�", required = true, example = "1")
+ @NotNull(message = "缁�佹椂闀夸笉鑳戒负绌�")
+ private String continueTime;
}
diff --git a/server/services/src/main/java/com/doumee/dao/vo/EstimatedDeliveryVO.java b/server/services/src/main/java/com/doumee/dao/vo/EstimatedDeliveryVO.java
index 0931d6a..7ee4a69 100644
--- a/server/services/src/main/java/com/doumee/dao/vo/EstimatedDeliveryVO.java
+++ b/server/services/src/main/java/com/doumee/dao/vo/EstimatedDeliveryVO.java
@@ -7,7 +7,7 @@
import java.io.Serializable;
/**
- * 棰勮鏃舵晥閰嶇疆鍒楄〃杩斿洖
+ * 棰勮鏃舵晥閰嶇疆(鍒楄〃杩斿洖)
* @author rk
* @date 2026/04/08
*/
@@ -21,9 +21,15 @@
@ApiModelProperty(value = "鍩庡競涓婚敭")
private Integer cityId;
- @ApiModelProperty(value = "閰嶉�侀噷绋�(鍏噷)")
- private String distance;
+ @ApiModelProperty(value = "璧烽�侀噷绋�(鍏噷)")
+ private String startDistance;
- @ApiModelProperty(value = "閰嶉�佹椂闀�(灏忔椂)")
- private String duration;
+ @ApiModelProperty(value = "璧烽�佹椂闀�")
+ private String startTime;
+
+ @ApiModelProperty(value = "缁�侀噷绋�(鍏噷)")
+ private String continueDistance;
+
+ @ApiModelProperty(value = "缁�佹椂闀�")
+ private String continueTime;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/PricingRuleService.java b/server/services/src/main/java/com/doumee/service/business/PricingRuleService.java
index 20dcb95..59a8bf7 100644
--- a/server/services/src/main/java/com/doumee/service/business/PricingRuleService.java
+++ b/server/services/src/main/java/com/doumee/service/business/PricingRuleService.java
@@ -133,30 +133,17 @@
List<RemoteDeliveryPricingVO> listRemoteDeliveryPricing(Integer cityId);
/**
- * 鏂板棰勮鏃舵晥閰嶇疆
- * @param request 淇濆瓨璇锋眰
- * @return 瑙勫垯涓婚敭
- */
- Integer createEstimatedDelivery(EstimatedDeliverySaveDTO request);
-
- /**
- * 淇敼棰勮鏃舵晥閰嶇疆
+ * 淇濆瓨棰勮鏃舵晥閰嶇疆(鏈夊垯鏇存柊锛屾棤鍒欐柊澧�)
* @param request 淇濆瓨璇锋眰
*/
- void updateEstimatedDelivery(EstimatedDeliverySaveDTO request);
+ void saveEstimatedDelivery(EstimatedDeliverySaveDTO request);
/**
- * 鍒犻櫎棰勮鏃舵晥閰嶇疆
- * @param id 瑙勫垯涓婚敭
- */
- void deleteEstimatedDelivery(Integer id);
-
- /**
- * 鏌ヨ棰勮鏃舵晥閰嶇疆鍒楄〃
+ * 鏌ヨ棰勮鏃舵晥閰嶇疆(鏈変笖鍙湁涓�鏉★紝鏃犳暟鎹繑鍥炵┖瀵硅薄)
* @param cityId 鍩庡競涓婚敭
- * @return 棰勮鏃舵晥閰嶇疆鍒楄〃
+ * @return 棰勮鏃舵晥閰嶇疆
*/
- List<EstimatedDeliveryVO> listEstimatedDelivery(Integer cityId);
+ EstimatedDeliveryVO getEstimatedDelivery(Integer cityId);
/**
* 鎵归噺淇濆瓨闂ㄥ簵娉ㄥ唽鎶奸噾
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java
index 3bf415e..e67a9b0 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java
@@ -312,7 +312,7 @@
member.setNickName(telephone);
member.setName(telephone);
member.setUserType(Constants.ONE);
- member.setDriverStatus(Constants.ZERO);
+ member.setBusinessStatus(Constants.ZERO);
member.setPassword(secure.encryptPassword(defaultPassword, salt));
member.setSalt(salt);
member.setWorkerIdentity(Constants.ZERO);
@@ -482,7 +482,7 @@
// 鏇存柊浼氬憳鍙告満璁よ瘉鐘舵�佷负璁よ瘉涓�
memberMapper.update(new UpdateWrapper<Member>().lambda()
- .set(Member::getDriverStatus, Constants.ONE)
+ .set(Member::getBusinessStatus, Constants.ONE)
.set(Member::getUpdateTime, now)
.eq(Member::getId, memberId));
}
@@ -559,7 +559,7 @@
// 鏇存柊浼氬憳鍙告満璁よ瘉鐘舵�侊細閫氳繃=2锛岄┏鍥�=3
Integer driverStatus = Constants.equalsInteger(newStatus, Constants.TWO) ? Constants.TWO : Constants.THREE;
memberMapper.update(new UpdateWrapper<Member>().lambda()
- .set(Member::getDriverStatus, driverStatus)
+ .set(Member::getBusinessStatus, driverStatus)
.set(Member::getUpdateTime, now)
.eq(Member::getId, driverInfo.getMemberId()));
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java
index b82f12d..81bb4b4 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java
@@ -379,66 +379,65 @@
}
@Override
- public Integer createEstimatedDelivery(EstimatedDeliverySaveDTO request) {
- PricingRule rule = new PricingRule();
- rule.setType(Constants.TWO);
- rule.setCityId(request.getCityId());
- rule.setFieldA(request.getDistance());
- rule.setFieldB(request.getDuration());
- rule.setDeleted(Constants.ZERO);
- rule.setCreateTime(new Date());
- rule.setUpdateTime(new Date());
- pricingRuleMapper.insert(rule);
- return rule.getId();
- }
-
- @Override
- public void updateEstimatedDelivery(EstimatedDeliverySaveDTO request) {
- if (request.getId() == null) {
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "涓婚敭涓嶈兘涓虹┖");
- }
- PricingRule existing = pricingRuleMapper.selectById(request.getId());
- if (Objects.isNull(existing) || !Constants.equalsInteger(existing.getType(), Constants.TWO)) {
- throw new BusinessException(ResponseStatus.DATA_EMPTY);
- }
- existing.setFieldA(request.getDistance());
- existing.setFieldB(request.getDuration());
- existing.setCityId(request.getCityId());
- existing.setUpdateTime(new Date());
- pricingRuleMapper.updateById(existing);
- }
-
- @Override
- public void deleteEstimatedDelivery(Integer id) {
- PricingRule existing = pricingRuleMapper.selectById(id);
- if (Objects.isNull(existing) || !Constants.equalsInteger(existing.getType(), Constants.TWO)) {
- throw new BusinessException(ResponseStatus.DATA_EMPTY);
- }
- existing.setDeleted(Constants.ONE);
- existing.setUpdateTime(new Date());
- pricingRuleMapper.updateById(existing);
- }
-
- @Override
- public List<EstimatedDeliveryVO> listEstimatedDelivery(Integer cityId) {
+ @Transactional(rollbackFor = Exception.class)
+ public void saveEstimatedDelivery(EstimatedDeliverySaveDTO request) {
+ // 鏌ヨ宸叉湁瑙勫垯 type=2, fieldA=1, cityId, deleted=0
QueryWrapper<PricingRule> qw = new QueryWrapper<>();
qw.lambda()
.eq(PricingRule::getType, Constants.TWO)
+ .eq(PricingRule::getFieldA, "1")
+ .eq(PricingRule::getCityId, request.getCityId())
+ .eq(PricingRule::getDeleted, Constants.ZERO)
+ .last("limit 1");
+ PricingRule existing = pricingRuleMapper.selectOne(qw);
+
+ Date now = new Date();
+ if (existing != null) {
+ // 鏇存柊
+ existing.setFieldB(request.getStartDistance());
+ existing.setFieldC(request.getStartTime());
+ existing.setFieldD(request.getContinueDistance());
+ existing.setFieldE(request.getContinueTime());
+ existing.setUpdateTime(now);
+ pricingRuleMapper.updateById(existing);
+ } else {
+ // 鏂板
+ PricingRule rule = new PricingRule();
+ rule.setType(Constants.TWO);
+ rule.setFieldA("1");
+ rule.setFieldB(request.getStartDistance());
+ rule.setFieldC(request.getStartTime());
+ rule.setFieldD(request.getContinueDistance());
+ rule.setFieldE(request.getContinueTime());
+ rule.setCityId(request.getCityId());
+ rule.setDeleted(Constants.ZERO);
+ rule.setCreateTime(now);
+ rule.setUpdateTime(now);
+ pricingRuleMapper.insert(rule);
+ }
+ }
+
+ @Override
+ public EstimatedDeliveryVO getEstimatedDelivery(Integer cityId) {
+ QueryWrapper<PricingRule> qw = new QueryWrapper<>();
+ qw.lambda()
+ .eq(PricingRule::getType, Constants.TWO)
+ .eq(PricingRule::getFieldA, "1")
.eq(PricingRule::getCityId, cityId)
.eq(PricingRule::getDeleted, Constants.ZERO)
- .orderByAsc(PricingRule::getFieldA);
- List<PricingRule> rules = pricingRuleMapper.selectList(qw);
- if (CollectionUtils.isEmpty(rules)) {
- return new ArrayList<>();
- }
- return rules.stream().map(rule -> {
- EstimatedDeliveryVO vo = new EstimatedDeliveryVO();
+ .last("limit 1");
+ PricingRule rule = pricingRuleMapper.selectOne(qw);
+
+ EstimatedDeliveryVO vo = new EstimatedDeliveryVO();
+ vo.setCityId(cityId);
+ if (rule != null) {
vo.setPricingRuleId(rule.getId());
- vo.setCityId(rule.getCityId());
- vo.setDistance(rule.getFieldA());
- vo.setDuration(rule.getFieldB());
- return vo;
- }).collect(Collectors.toList());
+ vo.setStartDistance(rule.getFieldB());
+ vo.setStartTime(rule.getFieldC());
+ vo.setContinueDistance(rule.getFieldD());
+ vo.setContinueTime(rule.getFieldE());
+ }
+ return vo;
}
@Override
--
Gitblit v1.9.3