Commit e34eddc3865bc5314a950fbc767404805e138ae4
1 parent
894b19b8
mall + trade:review 自提代码
Showing
4 changed files
with
9 additions
and
6 deletions
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
| @@ -47,6 +47,7 @@ public interface ErrorCodeConstants { | @@ -47,6 +47,7 @@ public interface ErrorCodeConstants { | ||
| 47 | 47 | ||
| 48 | // ========== 物流配送模块 1011003000 ========== | 48 | // ========== 物流配送模块 1011003000 ========== |
| 49 | ErrorCode DELIVERY_EXPRESS_NOT_EXISTS = new ErrorCode(1011003000, "快递公司不存在"); | 49 | ErrorCode DELIVERY_EXPRESS_NOT_EXISTS = new ErrorCode(1011003000, "快递公司不存在"); |
| 50 | + // TODO @jason:最好每个模块一段哈。express 一个;exmpresstemplate 一个;pickup 一个 | ||
| 50 | ErrorCode EXPRESS_CODE_DUPLICATE = new ErrorCode(1011003001, "已经存在该编码的快递公司"); | 51 | ErrorCode EXPRESS_CODE_DUPLICATE = new ErrorCode(1011003001, "已经存在该编码的快递公司"); |
| 51 | ErrorCode EXPRESS_TEMPLATE_NOT_EXISTS = new ErrorCode(1011003002, "运费模板不存在"); | 52 | ErrorCode EXPRESS_TEMPLATE_NOT_EXISTS = new ErrorCode(1011003002, "运费模板不存在"); |
| 52 | ErrorCode EXPRESS_TEMPLATE_NAME_DUPLICATE = new ErrorCode(1011003002, "已经存在该运费模板名"); | 53 | ErrorCode EXPRESS_TEMPLATE_NAME_DUPLICATE = new ErrorCode(1011003002, "已经存在该运费模板名"); |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
| @@ -84,6 +84,7 @@ public class DeliveryPickUpStoreController { | @@ -84,6 +84,7 @@ public class DeliveryPickUpStoreController { | ||
| 84 | return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult)); | 84 | return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult)); |
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | + // TODO @jason:导出去掉好列;简化下,一般用不到哈。 | ||
| 87 | @GetMapping("/export-excel") | 88 | @GetMapping("/export-excel") |
| 88 | @Operation(summary = "导出自提门店 Excel") | 89 | @Operation(summary = "导出自提门店 Excel") |
| 89 | @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:export')") | 90 | @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:export')") |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreBaseVO.java
| @@ -22,10 +22,10 @@ public class DeliveryPickUpStoreBaseVO { | @@ -22,10 +22,10 @@ public class DeliveryPickUpStoreBaseVO { | ||
| 22 | @NotBlank(message = "门店名称不能为空") | 22 | @NotBlank(message = "门店名称不能为空") |
| 23 | private String name; | 23 | private String name; |
| 24 | 24 | ||
| 25 | - @Schema(description = "门店简介") | 25 | + @Schema(description = "门店简介", example = "我是门店简介") |
| 26 | private String introduction; | 26 | private String introduction; |
| 27 | 27 | ||
| 28 | - @Schema(description = "门店手机", required = true) | 28 | + @Schema(description = "门店手机", required = true, example = "15601892312") |
| 29 | @NotBlank(message = "门店手机不能为空") | 29 | @NotBlank(message = "门店手机不能为空") |
| 30 | @Mobile | 30 | @Mobile |
| 31 | private String phone; | 31 | private String phone; |
| @@ -34,11 +34,11 @@ public class DeliveryPickUpStoreBaseVO { | @@ -34,11 +34,11 @@ public class DeliveryPickUpStoreBaseVO { | ||
| 34 | @NotNull(message = "区域编号不能为空") | 34 | @NotNull(message = "区域编号不能为空") |
| 35 | private Integer areaId; | 35 | private Integer areaId; |
| 36 | 36 | ||
| 37 | - @Schema(description = "门店详细地址", required = true) | 37 | + @Schema(description = "门店详细地址", required = true, example = "复旦大学路 188 号") |
| 38 | @NotBlank(message = "门店详细地址不能为空") | 38 | @NotBlank(message = "门店详细地址不能为空") |
| 39 | private String detailAddress; | 39 | private String detailAddress; |
| 40 | 40 | ||
| 41 | - @Schema(description = "门店 logo", required = true) | 41 | + @Schema(description = "门店 logo", required = true, example = "https://www.iocoder.cn/1.png") |
| 42 | @NotBlank(message = "门店 logo 不能为空") | 42 | @NotBlank(message = "门店 logo 不能为空") |
| 43 | private String logo; | 43 | private String logo; |
| 44 | 44 | ||
| @@ -52,11 +52,11 @@ public class DeliveryPickUpStoreBaseVO { | @@ -52,11 +52,11 @@ public class DeliveryPickUpStoreBaseVO { | ||
| 52 | @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm") | 52 | @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm") |
| 53 | private LocalTime closingTime; | 53 | private LocalTime closingTime; |
| 54 | 54 | ||
| 55 | - @Schema(description = "纬度", required = true) | 55 | + @Schema(description = "纬度", required = true, example = "5.88") |
| 56 | @NotNull(message = "纬度不能为空") | 56 | @NotNull(message = "纬度不能为空") |
| 57 | private Double latitude; | 57 | private Double latitude; |
| 58 | 58 | ||
| 59 | - @Schema(description = "经度", required = true) | 59 | + @Schema(description = "经度", required = true, example = "6.99") |
| 60 | @NotNull(message = "经度不能为空") | 60 | @NotNull(message = "经度不能为空") |
| 61 | private Double longitude; | 61 | private Double longitude; |
| 62 | 62 |
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExcelVO.java
| @@ -32,6 +32,7 @@ public class DeliveryPickUpStoreExcelVO { | @@ -32,6 +32,7 @@ public class DeliveryPickUpStoreExcelVO { | ||
| 32 | @ExcelProperty("门店logo") | 32 | @ExcelProperty("门店logo") |
| 33 | private String logo; | 33 | private String logo; |
| 34 | 34 | ||
| 35 | + // TODO @jason:是不是可以加个 convert? | ||
| 35 | /** | 36 | /** |
| 36 | * easy-excel 好像暂时不支持 LocalTime. 转成string | 37 | * easy-excel 好像暂时不支持 LocalTime. 转成string |
| 37 | */ | 38 | */ |