huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-27 01:32:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mall + trade：review 自提代码

Browse Source
This commit is contained in:
YunaiV 2023-05-31 09:18:24 +08:00
parent 894b19b8ec
commit e34eddc386
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
View File

@ -47,6 +47,7 @@ public interface ErrorCodeConstants {
// ========== 物流配送模块 1011003000 ========== // ========== 物流配送模块 1011003000 ==========
ErrorCode DELIVERY_EXPRESS_NOT_EXISTS = new ErrorCode(1011003000, "快递公司不存在"); ErrorCode DELIVERY_EXPRESS_NOT_EXISTS = new ErrorCode(1011003000, "快递公司不存在");
// TODO @jason：最好每个模块一段哈。express 一个；exmpresstemplate 一个；pickup 一个
ErrorCode EXPRESS_CODE_DUPLICATE = new ErrorCode(1011003001, "已经存在该编码的快递公司"); ErrorCode EXPRESS_CODE_DUPLICATE = new ErrorCode(1011003001, "已经存在该编码的快递公司");
ErrorCode EXPRESS_TEMPLATE_NOT_EXISTS = new ErrorCode(1011003002, "运费模板不存在"); ErrorCode EXPRESS_TEMPLATE_NOT_EXISTS = new ErrorCode(1011003002, "运费模板不存在");
ErrorCode EXPRESS_TEMPLATE_NAME_DUPLICATE = new ErrorCode(1011003002, "已经存在该运费模板名"); ErrorCode EXPRESS_TEMPLATE_NAME_DUPLICATE = new ErrorCode(1011003002, "已经存在该运费模板名");

1
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
View File

@ -84,6 +84,7 @@ public class DeliveryPickUpStoreController {
return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult)); return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult));
} }
// TODO @jason：导出去掉好列；简化下，一般用不到哈。
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出自提门店 Excel") @Operation(summary = "导出自提门店 Excel")
@PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:export')") @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:export')")

12
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreBaseVO.java
View File

@ -22,10 +22,10 @@ public class DeliveryPickUpStoreBaseVO {
@NotBlank(message = "门店名称不能为空") @NotBlank(message = "门店名称不能为空")
private String name; private String name;
@Schema(description = "门店简介") @Schema(description = "门店简介", example = "我是门店简介")
private String introduction; private String introduction;
@Schema(description = "门店手机", required = true) @Schema(description = "门店手机", required = true, example = "15601892312")
@NotBlank(message = "门店手机不能为空") @NotBlank(message = "门店手机不能为空")
@Mobile @Mobile
private String phone; private String phone;
@ -34,11 +34,11 @@ public class DeliveryPickUpStoreBaseVO {
@NotNull(message = "区域编号不能为空") @NotNull(message = "区域编号不能为空")
private Integer areaId; private Integer areaId;
@Schema(description = "门店详细地址", required = true) @Schema(description = "门店详细地址", required = true, example = "复旦大学路 188 号")
@NotBlank(message = "门店详细地址不能为空") @NotBlank(message = "门店详细地址不能为空")
private String detailAddress; private String detailAddress;
@Schema(description = "门店 logo", required = true) @Schema(description = "门店 logo", required = true, example = "https://www.iocoder.cn/1.png")
@NotBlank(message = "门店 logo 不能为空") @NotBlank(message = "门店 logo 不能为空")
private String logo; private String logo;
@ -52,11 +52,11 @@ public class DeliveryPickUpStoreBaseVO {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
private LocalTime closingTime; private LocalTime closingTime;
@Schema(description = "纬度", required = true) @Schema(description = "纬度", required = true, example = "5.88")
@NotNull(message = "纬度不能为空") @NotNull(message = "纬度不能为空")
private Double latitude; private Double latitude;
@Schema(description = "经度", required = true) @Schema(description = "经度", required = true, example = "6.99")
@NotNull(message = "经度不能为空") @NotNull(message = "经度不能为空")
private Double longitude; private Double longitude;

1
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExcelVO.java
View File

@ -32,6 +32,7 @@ public class DeliveryPickUpStoreExcelVO {
@ExcelProperty("门店logo") @ExcelProperty("门店logo")
private String logo; private String logo;
// TODO @jason：是不是可以加个 convert？
/** /**
* easy-excel 好像暂时不支持 LocalTime. 转成string * easy-excel 好像暂时不支持 LocalTime. 转成string
*/ */