BJ_ZTEITS-Developers / parking-cloud-yudao

Commit f8db53896f3467a2943a20d08d2588f63c41eb10

Authored by jason
1 parent 6bdc31a3

review 修改

Inline Side-by-side
Showing 12 changed files with 40 additions and 72 deletions
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
  View file @f8db538
... ... @@ -50,6 +50,7 @@ public interface ErrorCodeConstants {
50 50 ErrorCode EXPRESS_CODE_DUPLICATE = new ErrorCode(1011003001, "已经存在该编码的快递公司");
51 51 ErrorCode EXPRESS_TEMPLATE_NOT_EXISTS = new ErrorCode(1011003002, "运费模板不存在");
52 52 ErrorCode EXPRESS_TEMPLATE_NAME_DUPLICATE = new ErrorCode(1011003002, "已经存在该运费模板名");
  53 + ErrorCode PICK_UP_STORE_NOT_EXISTS = new ErrorCode(1011003003, "自提门店不存在");
53 54  
54 55 // ========== Price 相关 1011004000 ============
55 56 ErrorCode PRICE_CALCULATE_PAY_PRICE_ILLEGAL = new ErrorCode(1011004000, "支付价格计算异常，原因：价格小于等于 0");
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
  View file @f8db538
... ... @@ -75,7 +75,6 @@ public class DeliveryExpressController {
75 75 return success(DeliveryExpressConvert.INSTANCE.convertPage(pageResult));
76 76 }
77 77  
78   - // TODO @jason：运费模版，@芋艿 你的意思是运费模板导出没有必要吧。已经去掉了。这个是快递公司导出
79 78 @GetMapping("/export-excel")
80 79 @Operation(summary = "导出快递公司 Excel")
81 80 @PreAuthorize("@ss.hasPermission('trade:delivery:express:export')")
... ... @@ -87,5 +86,4 @@ public class DeliveryExpressController {
87 86 List<DeliveryExpressExcelVO> dataList = DeliveryExpressConvert.INSTANCE.convertList02(list);
88 87 ExcelUtils.write(response, "快递公司.xls", "数据", DeliveryExpressExcelVO.class, dataList);
89 88 }
90   -
91 89 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressTemplateController.java
  View file @f8db538
... ... @@ -20,7 +20,6 @@ import java.util.List;
20 20  
21 21 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
22 22  
23   -
24 23 @Tag(name = "管理后台 - 快递运费模板")
25 24 @RestController
26 25 @RequestMapping("/trade/delivery/express-template")
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/express/DeliveryExpressBaseVO.java
  View file @f8db538
... ... @@ -27,8 +27,8 @@ public class DeliveryExpressBaseVO {
27 27 @NotNull(message = "排序不能为空")
28 28 private Integer sort;
29 29  
30   - @Schema(description = "状态（0正常 1停用）", required = true, example = "1")
31   - @NotNull(message = "状态（0正常 1停用）不能为空")
  30 + @Schema(description = "状态", required = true, example = "1")
  31 + @NotNull(message = "状态不能为空")
32 32 private Integer status;
33 33  
34 34 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplateCreateReqVO.java
  View file @f8db538
... ... @@ -15,14 +15,12 @@ import java.util.List;
15 15 @ToString(callSuper = true)
16 16 public class DeliveryExpressTemplateCreateReqVO extends DeliveryExpressTemplateBaseVO {
17 17  
18   - // TODO @jason：不用给默认值哈
19   -
20 18 @Schema(description = "区域运费列表")
21 19 @Valid
22   - private List<ExpressTemplateChargeBaseVO> templateCharge = Collections.emptyList();
  20 + private List<ExpressTemplateChargeBaseVO> templateCharge;
23 21  
24 22 @Schema(description = "包邮区域列表")
25 23 @Valid
26   - private List<ExpressTemplateFreeBaseVO> templateFree = Collections.emptyList();
  24 + private List<ExpressTemplateFreeBaseVO> templateFree;
27 25  
28 26 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplateSimpleRespVO.java
  View file @f8db538
... ... @@ -5,6 +5,7 @@ import lombok.*;
5 5 import java.time.LocalDateTime;
6 6  
7 7 // TODO @jason：simplae 是不是不用继承 DeliveryExpressTemplateBaseVO，直接 id name 属性就够了。
  8 +// @芋艿 这里给列表显示用的。 需要显示计费方式和排序， 所以继承 DeliveryExpressTemplateBaseVO。 这是去掉了包邮区域和 区域运费列表
8 9 @Schema(description = "管理后台 - 快递运费模板 精简 Response VO")
9 10 @Data
10 11 @EqualsAndHashCode(callSuper = true)
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplateUpdateReqVO.java
  View file @f8db538
... ... @@ -7,7 +7,6 @@ import lombok.ToString;
7 7  
8 8 import javax.validation.Valid;
9 9 import javax.validation.constraints.NotNull;
10   -import java.util.Collections;
11 10 import java.util.List;
12 11  
13 12 @Schema(description = "管理后台 - 快递运费模板更新 Request VO")
... ... @@ -20,14 +19,38 @@ public class DeliveryExpressTemplateUpdateReqVO extends DeliveryExpressTemplateB
20 19 @NotNull(message = "编号不能为空")
21 20 private Long id;
22 21  
23   - // TODO @jason：pojo 不给默认值哈
24   -
25 22 @Schema(description = "区域运费列表")
26 23 @Valid
27   - private List<ExpressTemplateChargeUpdateVO> templateCharge = Collections.emptyList();
  24 + private List<ExpressTemplateChargeUpdateVO> templateCharge;
28 25  
29 26 @Schema(description = "包邮区域列表")
30 27 @Valid
31   - private List<ExpressTemplateFreeUpdateVO> templateFree = Collections.emptyList();
  28 + private List<ExpressTemplateFreeUpdateVO> templateFree;
  29 +
  30 + @Schema(description = "管理后台 - 快递运费模板区域运费更新 Request VO")
  31 + @Data
  32 + public static class ExpressTemplateChargeUpdateVO extends ExpressTemplateChargeBaseVO {
  33 +
  34 + @Schema(description = "编号", example = "6592")
  35 + private Long id;
  36 +
  37 + // TODO @jason：这几个字段，应该不通过前端传递，而是后端查询后去赋值的
  38 + @Schema(description = "配送模板编号", example = "1")
  39 + private Long templateId;
  40 +
  41 + @Schema(description = "配送计费方式", example = "1")
  42 + private Integer chargeMode;
  43 +
  44 + }
  45 +
  46 + @Schema(description = "管理后台 - 快递运费模板包邮区域更新 Request VO")
  47 + @Data
  48 + public static class ExpressTemplateFreeUpdateVO extends ExpressTemplateFreeBaseVO {
  49 +
  50 + @Schema(description = "编号", example = "6592")
  51 + private Long id;
32 52  
  53 + @Schema(description = "配送模板编号", example = "1")
  54 + private Long templateId;
  55 + }
33 56 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/ExpressTemplateChargeUpdateVO.java deleted
View file @6bdc31a
1   -package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.expresstemplate;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.Data;
5   -
6   -// TODO @jason：这个 vo 可以内嵌到 DeliveryExpressTemplateUpdateReqVO，避免 vo 过多，不好分辨
7   -@Schema(description = "管理后台 - 快递公司创建 Request VO")
8   -@Data
9   -public class ExpressTemplateChargeUpdateVO extends ExpressTemplateChargeBaseVO {
10   -
11   - @Schema(description = "编号", example = "6592")
12   - private Long id;
13   -
14   - // TODO @jason：这几个字段，应该不通过前端传递，而是后端查询后去赋值的
15   -
16   - @Schema(description = "配送模板编号", example = "1")
17   - private Long templateId;
18   -
19   - @Schema(description = "配送计费方式", example = "1")
20   - private Integer chargeMode;
21   -
22   -}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/ExpressTemplateFreeUpdateVO.java deleted
View file @6bdc31a
1   -package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.expresstemplate;
2   -
3   -import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.Data;
5   -
6   -// TODO @jason：这个 vo 可以内嵌到 DeliveryExpressTemplateUpdateReqVO，避免 vo 过多，不好分辨
7   -// TODO @jason：swagger 缺失
8   -/**
9   - * 快递运费模板包邮 更新 VO
10   - */
11   -@Data
12   -public class ExpressTemplateFreeUpdateVO extends ExpressTemplateFreeBaseVO {
13   -
14   - @Schema(description = "编号", example = "6592")
15   - private Long id;
16   -
17   - @Schema(description = "配送模板编号", example = "1")
18   - private Long templateId;
19   -}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java
  View file @f8db538
... ... @@ -12,12 +12,6 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
12 12 import org.mapstruct.Mapper;
13 13 import org.mapstruct.factory.Mappers;
14 14  
15   -
16   -/**
17   - * 快递公司 Convert
18   - *
19   - * @author jason
20   - */
21 15 @Mapper
22 16 public interface DeliveryExpressConvert {
23 17  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressTemplateConvert.java
  View file @f8db538
... ... @@ -11,11 +11,6 @@ import org.mapstruct.factory.Mappers;
11 11  
12 12 import java.util.List;
13 13  
14   -/**
15   - * 快递运费模板 Convert
16   - *
17   - * @author jason
18   - */
19 14 @Mapper
20 15 public interface DeliveryExpressTemplateConvert {
21 16  
... ... @@ -48,7 +43,7 @@ public interface DeliveryExpressTemplateConvert {
48 43  
49 44 DeliveryExpressTemplateChargeDO convertTemplateCharge(Long templateId, Integer chargeMode, ExpressTemplateChargeBaseVO vo);
50 45  
51   - DeliveryExpressTemplateChargeDO convertTemplateCharge(ExpressTemplateChargeUpdateVO vo);
  46 + DeliveryExpressTemplateChargeDO convertTemplateCharge(DeliveryExpressTemplateUpdateReqVO.ExpressTemplateChargeUpdateVO vo);
52 47  
53 48 default List<DeliveryExpressTemplateChargeDO> convertTemplateChargeList(Long templateId, Integer chargeMode, List<ExpressTemplateChargeBaseVO> list) {
54 49 return CollectionUtils.convertList(list, vo -> convertTemplateCharge(templateId, chargeMode, vo));
... ... @@ -58,7 +53,7 @@ public interface DeliveryExpressTemplateConvert {
58 53  
59 54 DeliveryExpressTemplateFreeDO convertTemplateFree(Long templateId, ExpressTemplateFreeBaseVO vo);
60 55  
61   - DeliveryExpressTemplateFreeDO convertTemplateFree(ExpressTemplateFreeUpdateVO vo);
  56 + DeliveryExpressTemplateFreeDO convertTemplateFree(DeliveryExpressTemplateUpdateReqVO.ExpressTemplateFreeUpdateVO vo);
62 57  
63 58 List<ExpressTemplateChargeBaseVO> convertTemplateChargeList(List<DeliveryExpressTemplateChargeDO> list);
64 59  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressTemplateServiceImpl.java
  View file @f8db538
... ... @@ -82,10 +82,10 @@ public class DeliveryExpressTemplateServiceImpl implements DeliveryExpressTempla
82 82 private void updateExpressTemplateFree(DeliveryExpressTemplateUpdateReqVO updateReqVO) {
83 83 // 1.1 获得新增/修改的区域列表
84 84 List<DeliveryExpressTemplateFreeDO> oldFreeList = expressTemplateFreeMapper.selectListByTemplateId(updateReqVO.getId());
85   - List<ExpressTemplateFreeUpdateVO> newFreeList = updateReqVO.getTemplateFree();
  85 + List<DeliveryExpressTemplateUpdateReqVO.ExpressTemplateFreeUpdateVO> newFreeList = updateReqVO.getTemplateFree();
86 86 List<DeliveryExpressTemplateFreeDO> addFreeList = new ArrayList<>(newFreeList.size()); // 新增包邮区域列表
87 87 List<DeliveryExpressTemplateFreeDO> updateFreeList = new ArrayList<>(newFreeList.size()); // 更新包邮区域列表
88   - for (ExpressTemplateFreeUpdateVO item : newFreeList) {
  88 + for (DeliveryExpressTemplateUpdateReqVO.ExpressTemplateFreeUpdateVO item : newFreeList) {
89 89 if (Objects.nonNull(item.getId())) {
90 90 updateFreeList.add(INSTANCE.convertTemplateFree(item));
91 91 } else {
... ... @@ -113,10 +113,10 @@ public class DeliveryExpressTemplateServiceImpl implements DeliveryExpressTempla
113 113 private void updateExpressTemplateCharge(DeliveryExpressTemplateUpdateReqVO updateReqVO) {
114 114 // 1.1 获得新增/修改的区域列表
115 115 List<DeliveryExpressTemplateChargeDO> oldChargeList = expressTemplateChargeMapper.selectListByTemplateId(updateReqVO.getId());
116   - List<ExpressTemplateChargeUpdateVO> newChargeList = updateReqVO.getTemplateCharge();
  116 + List<DeliveryExpressTemplateUpdateReqVO.ExpressTemplateChargeUpdateVO> newChargeList = updateReqVO.getTemplateCharge();
117 117 List<DeliveryExpressTemplateChargeDO> addList = new ArrayList<>(newChargeList.size()); // 新增运费区域列表
118 118 List<DeliveryExpressTemplateChargeDO> updateList = new ArrayList<>(newChargeList.size()); // 更新运费区域列表
119   - for (ExpressTemplateChargeUpdateVO item : newChargeList) {
  119 + for (DeliveryExpressTemplateUpdateReqVO.ExpressTemplateChargeUpdateVO item : newChargeList) {
120 120 if (item.getId() != null) {
121 121 // 计费模式以主表为准
122 122 item.setChargeMode(updateReqVO.getChargeMode());
... ...