BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 910d374ceee729396afd932ab8665706ab46a11d

Authored by YunaiV
1 parent 36ce9688

mall + trade：review 运费价格计算

Inline Side-by-side
Showing 7 changed files with 44 additions and 49 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressTemplateController.java
  View file @910d374
... ... @@ -57,7 +57,7 @@ public class DeliveryExpressTemplateController {
57 57 @Operation(summary = "获得快递运费模板")
58 58 @Parameter(name = "id", description = "编号", required = true, example = "1024")
59 59 @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:query')")
60   - public CommonResult<DeliveryExpressTemplateRespVO> getDeliveryExpressTemplate(@RequestParam("id") Long id) {
  60 + public CommonResult<DeliveryExpressTemplateDetailRespVO> getDeliveryExpressTemplate(@RequestParam("id") Long id) {
61 61 return success(deliveryExpressTemplateService.getDeliveryExpressTemplate(id));
62 62 }
63 63  
... ... @@ -65,7 +65,7 @@ public class DeliveryExpressTemplateController {
65 65 @Operation(summary = "获得快递运费模板列表")
66 66 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
67 67 @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:query')")
68   - public CommonResult<List<DeliveryExpressTemplateSimpleRespVO>> getDeliveryExpressTemplateList(@RequestParam("ids") Collection<Long> ids) {
  68 + public CommonResult<List<DeliveryExpressTemplateRespVO>> getDeliveryExpressTemplateList(@RequestParam("ids") Collection<Long> ids) {
69 69 List<DeliveryExpressTemplateDO> list = deliveryExpressTemplateService.getDeliveryExpressTemplateList(ids);
70 70 return success(DeliveryExpressTemplateConvert.INSTANCE.convertList(list));
71 71 }
... ... @@ -73,7 +73,7 @@ public class DeliveryExpressTemplateController {
73 73 @GetMapping("/page")
74 74 @Operation(summary = "获得快递运费模板分页")
75 75 @PreAuthorize("@ss.hasPermission('trade:delivery:express-template:query')")
76   - public CommonResult<PageResult<DeliveryExpressTemplateSimpleRespVO>> getDeliveryExpressTemplatePage(@Valid DeliveryExpressTemplatePageReqVO pageVO) {
  76 + public CommonResult<PageResult<DeliveryExpressTemplateRespVO>> getDeliveryExpressTemplatePage(@Valid DeliveryExpressTemplatePageReqVO pageVO) {
77 77 PageResult<DeliveryExpressTemplateDO> pageResult = deliveryExpressTemplateService.getDeliveryExpressTemplatePage(pageVO);
78 78 return success(DeliveryExpressTemplateConvert.INSTANCE.convertPage(pageResult));
79 79 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplateDetailRespVO.java 0 → 100644
  View file @910d374
  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 +import lombok.EqualsAndHashCode;
  6 +import lombok.ToString;
  7 +
  8 +import java.util.List;
  9 +
  10 +@Schema(description = "管理后台 - 快递运费模板的详细 Response VO")
  11 +@Data
  12 +@EqualsAndHashCode(callSuper = true)
  13 +@ToString(callSuper = true)
  14 +public class DeliveryExpressTemplateDetailRespVO extends DeliveryExpressTemplateBaseVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "371")
  17 + private Long id;
  18 +
  19 + @Schema(description = "运费模板运费设置", requiredMode = Schema.RequiredMode.REQUIRED)
  20 + private List<ExpressTemplateChargeBaseVO> templateCharge;
  21 +
  22 + @Schema(description = "运费模板包邮区域", requiredMode = Schema.RequiredMode.REQUIRED)
  23 + private List<ExpressTemplateFreeBaseVO> templateFree;
  24 +
  25 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplateRespVO.java
  View file @910d374
1 1 package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.expresstemplate;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.Data;
5   -import lombok.EqualsAndHashCode;
6   -import lombok.ToString;
  4 +import lombok.*;
  5 +import java.time.LocalDateTime;
7 6  
8   -import java.util.List;
9   -
10   -/**
11   - * @author jason
12   - */
13 7 @Schema(description = "管理后台 - 快递运费模板 Response VO")
14 8 @Data
15 9 @EqualsAndHashCode(callSuper = true)
16 10 @ToString(callSuper = true)
17 11 public class DeliveryExpressTemplateRespVO extends DeliveryExpressTemplateBaseVO {
18 12  
19   - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "371")
  13 + @Schema(description = "编号，自增", required = true, example = "371")
20 14 private Long id;
21 15  
22   - @Schema(description = "运费模板运费设置", requiredMode = Schema.RequiredMode.REQUIRED)
23   - private List<ExpressTemplateChargeBaseVO> templateCharge;
24   -
25   - @Schema(description = "运费模板包邮区域", requiredMode = Schema.RequiredMode.REQUIRED)
26   - private List<ExpressTemplateFreeBaseVO> templateFree;
  16 + @Schema(description = "创建时间", required = true)
  17 + private LocalDateTime createTime;
27 18  
28 19 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplateSimpleRespVO.java deleted
View file @36ce968
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.*;
5   -import java.time.LocalDateTime;
6   -
7   -// TODO @jason：simplae 是不是不用继承 DeliveryExpressTemplateBaseVO，直接 id name 属性就够了。
8   -// @芋艿 这里给列表显示用的。 需要显示计费方式和排序， 所以继承 DeliveryExpressTemplateBaseVO。 这是去掉了包邮区域和 区域运费列表
9   -@Schema(description = "管理后台 - 快递运费模板 精简 Response VO")
10   -@Data
11   -@EqualsAndHashCode(callSuper = true)
12   -@ToString(callSuper = true)
13   -public class DeliveryExpressTemplateSimpleRespVO extends DeliveryExpressTemplateBaseVO {
14   -
15   - @Schema(description = "编号，自增", required = true, example = "371")
16   - private Long id;
17   -
18   - @Schema(description = "创建时间", required = true)
19   - private LocalDateTime createTime;
20   -
21   -}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressTemplateConvert.java
  View file @910d374
... ... @@ -22,18 +22,18 @@ public interface DeliveryExpressTemplateConvert {
22 22  
23 23 DeliveryExpressTemplateDO convert(DeliveryExpressTemplateUpdateReqVO bean);
24 24  
25   - DeliveryExpressTemplateSimpleRespVO convert(DeliveryExpressTemplateDO bean);
  25 + DeliveryExpressTemplateRespVO convert(DeliveryExpressTemplateDO bean);
26 26  
27   - DeliveryExpressTemplateRespVO convert2(DeliveryExpressTemplateDO bean);
  27 + DeliveryExpressTemplateDetailRespVO convert2(DeliveryExpressTemplateDO bean);
28 28  
29   - List<DeliveryExpressTemplateSimpleRespVO> convertList(List<DeliveryExpressTemplateDO> list);
  29 + List<DeliveryExpressTemplateRespVO> convertList(List<DeliveryExpressTemplateDO> list);
30 30  
31   - PageResult<DeliveryExpressTemplateSimpleRespVO> convertPage(PageResult<DeliveryExpressTemplateDO> page);
  31 + PageResult<DeliveryExpressTemplateRespVO> convertPage(PageResult<DeliveryExpressTemplateDO> page);
32 32  
33   - default DeliveryExpressTemplateRespVO convert(DeliveryExpressTemplateDO bean,
34   - List<DeliveryExpressTemplateChargeDO> chargeList,
35   - List<DeliveryExpressTemplateFreeDO> freeList){
36   - DeliveryExpressTemplateRespVO respVO = convert2(bean);
  33 + default DeliveryExpressTemplateDetailRespVO convert(DeliveryExpressTemplateDO bean,
  34 + List<DeliveryExpressTemplateChargeDO> chargeList,
  35 + List<DeliveryExpressTemplateFreeDO> freeList){
  36 + DeliveryExpressTemplateDetailRespVO respVO = convert2(bean);
37 37 respVO.setTemplateCharge(convertTemplateChargeList(chargeList));
38 38 respVO.setTemplateFree(convertTemplateFreeList(freeList));
39 39 return respVO;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressTemplateService.java
  View file @910d374
... ... @@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.trade.service.delivery;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.expresstemplate.DeliveryExpressTemplateCreateReqVO;
  5 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.expresstemplate.DeliveryExpressTemplateDetailRespVO;
5 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.expresstemplate.DeliveryExpressTemplatePageReqVO;
6   -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.expresstemplate.DeliveryExpressTemplateRespVO;
7 7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.expresstemplate.DeliveryExpressTemplateUpdateReqVO;
8 8 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressTemplateDO;
9 9  
... ... @@ -46,7 +46,7 @@ public interface DeliveryExpressTemplateService {
46 46 * @param id 编号
47 47 * @return 快递运费模板详情
48 48 */
49   - DeliveryExpressTemplateRespVO getDeliveryExpressTemplate(Long id);
  49 + DeliveryExpressTemplateDetailRespVO getDeliveryExpressTemplate(Long id);
50 50  
51 51 /**
52 52 * 获得快递运费模板列表
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressTemplateServiceImpl.java
  View file @910d374
... ... @@ -185,7 +185,7 @@ public class DeliveryExpressTemplateServiceImpl implements DeliveryExpressTempla
185 185 }
186 186  
187 187 @Override
188   - public DeliveryExpressTemplateRespVO getDeliveryExpressTemplate(Long id) {
  188 + public DeliveryExpressTemplateDetailRespVO getDeliveryExpressTemplate(Long id) {
189 189 List<DeliveryExpressTemplateChargeDO> chargeList = expressTemplateChargeMapper.selectListByTemplateId(id);
190 190 List<DeliveryExpressTemplateFreeDO> freeList = expressTemplateFreeMapper.selectListByTemplateId(id);
191 191 DeliveryExpressTemplateDO template = expressTemplateMapper.selectById(id);
... ...