BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 4c634245e9d53b14127425185cb275cc502a1c4f

Authored by 芋道源码
Committed by Gitee
2 parents 54bf24b9 002475f3

!581 订单列表管理重构完善 

Merge pull request !581 from puhui999/feature/mall_product
Inline Side-by-side
Showing 29 changed files with 371 additions and 201 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/bargain/vo/BargainActivityBaseVO.java
  View file @4c63424
... ... @@ -18,7 +18,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
18 18 @Data
19 19 public class BargainActivityBaseVO {
20 20  
21   - @Schema(description = "砍价活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "越拼越省钱")
  21 + @Schema(description = "砍价活动名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "砍得越多省得越多，是兄弟就来砍我")
22 22 @NotNull(message = "砍价名称不能为空")
23 23 private String name;
24 24  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
  View file @4c63424
1 1 package cn.iocoder.yudao.module.trade.controller.admin.delivery;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 6 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6 7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7 8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.*;
8   -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressUpdateReqVO;
9 9 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryExpressConvert;
10 10 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
11 11 import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService;
... ... @@ -67,6 +67,15 @@ public class DeliveryExpressController {
67 67 return success(DeliveryExpressConvert.INSTANCE.convert(deliveryExpress));
68 68 }
69 69  
  70 + @GetMapping("/list-all-simple")
  71 + @Operation(summary = "获取快递公司精简信息列表", description = "主要用于前端的下拉选项")
  72 + public CommonResult<List<DeliveryExpressSimpleRespVO>> getSimpleDeliveryExpressList() {
  73 + // 获取品牌列表，只要开启状态的
  74 + List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
  75 + // 排序后，返回给前端
  76 + return success(DeliveryExpressConvert.INSTANCE.convertList1(list));
  77 + }
  78 +
70 79 @GetMapping("/page")
71 80 @Operation(summary = "获得快递公司分页")
72 81 @PreAuthorize("@ss.hasPermission('trade:delivery:express:query')")
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
  View file @4c63424
1 1 package cn.iocoder.yudao.module.trade.controller.admin.delivery;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
6   -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
7 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
8 7 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
9 8 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
... ... @@ -16,14 +15,11 @@ import org.springframework.validation.annotation.Validated;
16 15 import org.springframework.web.bind.annotation.*;
17 16  
18 17 import javax.annotation.Resource;
19   -import javax.servlet.http.HttpServletResponse;
20 18 import javax.validation.Valid;
21   -import java.io.IOException;
22 19 import java.util.Collection;
23 20 import java.util.List;
24 21  
25 22 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
26   -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
27 23  
28 24 @Tag(name = "管理后台 - 自提门店")
29 25 @RestController
... ... @@ -67,6 +63,15 @@ public class DeliveryPickUpStoreController {
67 63 return success(DeliveryPickUpStoreConvert.INSTANCE.convert(deliveryPickUpStore));
68 64 }
69 65  
  66 + @GetMapping("/list-all-simple")
  67 + @Operation(summary = "获取快递公司精简信息列表")
  68 + public CommonResult<List<DeliveryPickUpStoreSimpleRespVO>> getSimpleDeliveryPickUpStoreList() {
  69 + // 获取品牌列表，只要开启状态的
  70 + List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreListByStatus(CommonStatusEnum.ENABLE.getStatus());
  71 + // 排序后，返回给前端
  72 + return success(DeliveryPickUpStoreConvert.INSTANCE.convertList1(list));
  73 + }
  74 +
70 75 @GetMapping("/list")
71 76 @Operation(summary = "获得自提门店列表")
72 77 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
... ... @@ -84,16 +89,4 @@ public class DeliveryPickUpStoreController {
84 89 return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult));
85 90 }
86 91  
87   - // TODO @jason：导出去掉好列；简化下，一般用不到哈。
88   - @GetMapping("/export-excel")
89   - @Operation(summary = "导出自提门店 Excel")
90   - @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:export')")
91   - @OperateLog(type = EXPORT)
92   - public void exportDeliveryPickUpStoreExcel(@Valid DeliveryPickUpStoreExportReqVO exportReqVO,
93   - HttpServletResponse response) throws IOException {
94   - List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreList(exportReqVO);
95   - // 导出 Excel
96   - List<DeliveryPickUpStoreExcelVO> datas = DeliveryPickUpStoreConvert.INSTANCE.convertList02(list);
97   - ExcelUtils.write(response, "自提门店.xls", "数据", DeliveryPickUpStoreExcelVO.class, datas);
98   - }
99 92 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/express/DeliveryExpressSimpleRespVO.java 0 → 100644
  View file @4c63424
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.AllArgsConstructor;
  5 +import lombok.Data;
  6 +import lombok.NoArgsConstructor;
  7 +
  8 +import javax.validation.constraints.NotNull;
  9 +
  10 +@Schema(description = "管理后台 - 快递公司精简信息 Response VO")
  11 +@Data
  12 +@NoArgsConstructor
  13 +@AllArgsConstructor
  14 +public class DeliveryExpressSimpleRespVO {
  15 +
  16 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "6592")
  17 + @NotNull(message = "编号不能为空")
  18 + private Long id;
  19 +
  20 + @Schema(description = "快递公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "顺丰速运")
  21 + @NotNull(message = "快递公司名称不能为空")
  22 + private String name;
  23 +
  24 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExcelVO.java deleted
View file @54bf24b
1   -package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
2   -
3   -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4   -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5   -import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
6   -import com.alibaba.excel.annotation.ExcelProperty;
7   -import lombok.Data;
8   -
9   -import java.time.LocalDateTime;
10   -
11   -@Data
12   -public class DeliveryPickUpStoreExcelVO {
13   -
14   - @ExcelProperty("编号")
15   - private Long id;
16   -
17   - @ExcelProperty("门店名称")
18   - private String name;
19   -
20   - @ExcelProperty("门店简介")
21   - private String introduction;
22   -
23   - @ExcelProperty("门店手机")
24   - private String phone;
25   -
26   - @ExcelProperty("门店所在区域")
27   - private String areaName;
28   -
29   - @ExcelProperty("门店详细地址")
30   - private String detailAddress;
31   -
32   - @ExcelProperty("门店logo")
33   - private String logo;
34   -
35   - // TODO @jason：是不是可以加个 convert？
36   - /**
37   - * easy-excel 好像暂时不支持 LocalTime. 转成string
38   - */
39   - @ExcelProperty("营业开始时间")
40   - private String openingTime;
41   -
42   - @ExcelProperty("营业结束时间")
43   - private String closingTime;
44   -
45   - @ExcelProperty("纬度")
46   - private String latitude;
47   -
48   - @ExcelProperty("经度")
49   - private String longitude;
50   -
51   - @ExcelProperty(value = "状态", converter = DictConvert.class)
52   - @DictFormat(DictTypeConstants.COMMON_STATUS)
53   - private Integer status;
54   -
55   - @ExcelProperty("创建时间")
56   - private LocalDateTime createTime;
57   -
58   -}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExportReqVO.java deleted
View file @54bf24b
1   -package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
2   -
3   -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4   -import cn.iocoder.yudao.framework.common.validation.InEnum;
5   -import io.swagger.v3.oas.annotations.media.Schema;
6   -import lombok.Data;
7   -import org.springframework.format.annotation.DateTimeFormat;
8   -
9   -import java.time.LocalDateTime;
10   -
11   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
12   -
13   -@Schema(description = "管理后台 - 自提门店 Excel 导出 Request VO，参数和 DeliveryPickUpStorePageReqVO 是一致的")
14   -@Data
15   -public class DeliveryPickUpStoreExportReqVO {
16   -
17   - @Schema(description = "门店名称", example = "李四")
18   - private String name;
19   -
20   - @Schema(description = "门店手机")
21   - private String phone;
22   -
23   - @Schema(description = "区域id", example = "18733")
24   - private Integer areaId;
25   -
26   - @Schema(description = "门店状态", example = "1")
27   - @InEnum(CommonStatusEnum.class)
28   - private Integer status;
29   -
30   - @Schema(description = "创建时间")
31   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
32   - private LocalDateTime[] createTime;
33   -
34   -}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreSimpleRespVO.java 0 → 100644
  View file @4c63424
  1 +package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
  2 +
  3 +import cn.iocoder.yudao.framework.common.validation.Mobile;
  4 +import com.fasterxml.jackson.annotation.JsonFormat;
  5 +import io.swagger.v3.oas.annotations.media.Schema;
  6 +import lombok.AllArgsConstructor;
  7 +import lombok.Data;
  8 +import lombok.NoArgsConstructor;
  9 +
  10 +import javax.validation.constraints.NotBlank;
  11 +import javax.validation.constraints.NotNull;
  12 +import java.time.LocalTime;
  13 +
  14 +@Schema(description = "管理后台 - 自提门店精简信息 Response VO")
  15 +@Data
  16 +@NoArgsConstructor
  17 +@AllArgsConstructor
  18 +public class DeliveryPickUpStoreSimpleRespVO {
  19 +
  20 + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23128")
  21 + @NotNull(message = "编号不能为空")
  22 + private Long id;
  23 +
  24 + @Schema(description = "门店名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
  25 + @NotBlank(message = "门店名称不能为空")
  26 + private String name;
  27 +
  28 + @Schema(description = "门店手机", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601892312")
  29 + @NotBlank(message = "门店手机不能为空")
  30 + @Mobile
  31 + private String phone;
  32 +
  33 + @Schema(description = "区域编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18733")
  34 + @NotNull(message = "区域编号不能为空")
  35 + private Integer areaId;
  36 +
  37 + @Schema(description = "门店详细地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "复旦大学路 188 号")
  38 + @NotBlank(message = "门店详细地址不能为空")
  39 + private String detailAddress;
  40 +
  41 + @Schema(description = "营业开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
  42 + @NotNull(message = "营业开始时间不能为空")
  43 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
  44 + private LocalTime openingTime;
  45 +
  46 + @Schema(description = "营业结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
  47 + @NotNull(message = "营业结束时间不能为空")
  48 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
  49 + private LocalTime closingTime;
  50 +
  51 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java
  View file @4c63424
... ... @@ -5,10 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
7 7 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
8   -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
9   -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDetailRespVO;
10   -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO;
11   -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
  8 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.*;
12 9 import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert;
13 10 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
14 11 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
... ... @@ -79,12 +76,52 @@ public class TradeOrderController {
79 76 return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, user));
80 77 }
81 78  
  79 + @GetMapping("/get-express-track-list")
  80 + @Operation(summary = "获得交易订单的物流轨迹")
  81 + @Parameter(name = "id", description = "交易订单编号")
  82 + @PreAuthorize("@ss.hasPermission('trade:order:query')")
  83 + public CommonResult<List<?>> getOrderExpressTrackList(@RequestParam("id") Long id) {
  84 + return success(TradeOrderConvert.INSTANCE.convertList02(
  85 + tradeOrderQueryService.getExpressTrackList(id, getLoginUserId())));
  86 + }
  87 +
82 88 @PostMapping("/delivery")
83   - @Operation(summary = "发货订单")
84   - @PreAuthorize("@ss.hasPermission('trade:order:delivery')")
  89 + @Operation(summary = "订单发货")
  90 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
85 91 public CommonResult<Boolean> deliveryOrder(@RequestBody TradeOrderDeliveryReqVO deliveryReqVO) {
86   - tradeOrderUpdateService.deliveryOrder(getLoginUserId(), deliveryReqVO);
  92 + tradeOrderUpdateService.deliveryOrder(deliveryReqVO);
87 93 return success(true);
88 94 }
89 95  
  96 + @PostMapping("/remark")
  97 + @Operation(summary = "订单备注")
  98 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
  99 + public CommonResult<Boolean> remarkOrder(@RequestBody TradeOrderRemarkReqVO reqVO) {
  100 + tradeOrderUpdateService.remarkOrder(reqVO);
  101 + return success(true);
  102 + }
  103 +
  104 + @PostMapping("/adjust-price")
  105 + @Operation(summary = "订单调价")
  106 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
  107 + public CommonResult<Boolean> adjustPrice(@RequestBody TradeOrderAdjustPriceReqVO reqVO) {
  108 + tradeOrderUpdateService.adjustPrice(reqVO);
  109 + return success(true);
  110 + }
  111 +
  112 + @PostMapping("/adjust-address")
  113 + @Operation(summary = "修改订单收货地址")
  114 + @PreAuthorize("@ss.hasPermission('trade:order:update')")
  115 + public CommonResult<Boolean> adjustAddress(@RequestBody TradeOrderAdjustAddressReqVO reqVO) {
  116 + tradeOrderUpdateService.adjustAddress(reqVO);
  117 + return success(true);
  118 + }
  119 +
  120 + // TODO @puhui999 订单物流详情
  121 + // TODO @puhui999 【前台】订单取消
  122 + // TODO @puhui999 【后台】订单取消
  123 + // TODO @puhui999 【前台】订单核销
  124 + // TODO @puhui999 【前台】订单删除
  125 + // TODO @puhui999 【后台】订单统计
  126 +
90 127 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderAdjustAddressReqVO.java 0 → 100644
  View file @4c63424
  1 +package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotEmpty;
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "管理后台 - 订单修改地址 Request VO")
  10 +@Data
  11 +public class TradeOrderAdjustAddressReqVO {
  12 +
  13 + @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  14 + @NotNull(message = "订单编号不能为空")
  15 + private Long id;
  16 +
  17 + @Schema(description = "收件人名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "z张三")
  18 + @NotEmpty(message = "收件人名称不能为空")
  19 + private String receiverName;
  20 +
  21 + @Schema(description = "收件人手机", requiredMode = Schema.RequiredMode.REQUIRED, example = "19988188888")
  22 + @NotEmpty(message = "收件人手机不能为空")
  23 + private String receiverMobile;
  24 +
  25 + @Schema(description = "收件人地区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7310")
  26 + @NotNull(message = "收件人地区编号不能为空")
  27 + private Integer receiverAreaId;
  28 +
  29 + @Schema(description = "收件人详细地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "昆明市五华区xxx小区xxx")
  30 + @NotEmpty(message = "收件人详细地址不能为空")
  31 + private String receiverDetailAddress;
  32 +
  33 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderAdjustPriceReqVO.java 0 → 100644
  View file @4c63424
  1 +package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotNull;
  7 +
  8 +@Schema(description = "管理后台 - 订单改价 Request VO")
  9 +@Data
  10 +public class TradeOrderAdjustPriceReqVO {
  11 +
  12 + @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  13 + @NotNull(message = "订单编号不能为空")
  14 + private Long id;
  15 +
  16 + @Schema(description = "订单调价，单位：分 正数，加价；负数，减价", requiredMode = Schema.RequiredMode.REQUIRED, example = "-100")
  17 + @NotNull(message = "订单调价价格不能为空")
  18 + private Integer adjustPrice;
  19 +
  20 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
  View file @4c63424
... ... @@ -6,9 +6,9 @@ import lombok.Data;
6 6 import java.time.LocalDateTime;
7 7  
8 8 /**
9   -* 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用
10   -* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
11   -*/
  9 + * 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用
  10 + * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  11 + */
12 12 @Data
13 13 public class TradeOrderBaseVO {
14 14  
... ... @@ -87,6 +87,12 @@ public class TradeOrderBaseVO {
87 87  
88 88 // ========== 收件 + 物流基本信息 ==========
89 89  
  90 + @Schema(description = "配送方式", example = "10")
  91 + private Integer deliveryType;
  92 +
  93 + @Schema(description = "自提门店", example = "10")
  94 + private Long pickUpStoreId;
  95 +
90 96 @Schema(description = "配送模板编号", example = "1024")
91 97 private Long deliveryTemplateId;
92 98  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderDeliveryReqVO.java
  View file @4c63424
1 1 package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
2 2  
3   -import cn.iocoder.yudao.framework.common.validation.InEnum;
4   -import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
5 3 import io.swagger.v3.oas.annotations.media.Schema;
6 4 import lombok.Data;
7 5  
8   -import javax.validation.constraints.NotEmpty;
9 6 import javax.validation.constraints.NotNull;
10 7  
11 8 @Schema(description = "管理后台 - 订单发货 Request VO")
... ... @@ -16,18 +13,11 @@ public class TradeOrderDeliveryReqVO {
16 13 @NotNull(message = "订单编号不能为空")
17 14 private Long id;
18 15  
19   - // TODO @puhui999：可以去掉 type；如果无需发货，则 logisticsId 传递 0；logisticsNo 传递空串
20   - @Schema(description = "发货类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
21   - @InEnum(DeliveryTypeEnum.class)
22   - @NotNull(message = "发货类型不能为空")
23   - private Integer type;
24   -
25 16 @Schema(description = "发货物流公司编号", example = "1")
26 17 @NotNull(message = "发货物流公司不能为空")
27 18 private Long logisticsId;
28 19  
29 20 @Schema(description = "发货物流单号", example = "SF123456789")
30   - @NotEmpty(message = "发货物流单号不能为空")
31 21 private String logisticsNo;
32 22  
33 23 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderPageReqVO.java
  View file @4c63424
... ... @@ -10,6 +10,7 @@ import lombok.Data;
10 10 import org.springframework.format.annotation.DateTimeFormat;
11 11  
12 12 import java.time.LocalDateTime;
  13 +import java.util.List;
13 14  
14 15 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
15 16  
... ... @@ -30,6 +31,12 @@ public class TradeOrderPageReqVO extends PageParam {
30 31 @Mobile
31 32 private String userMobile;
32 33  
  34 + @Schema(description = "发货物流公司编号", example = "1")
  35 + private Long logisticsId;
  36 +
  37 + @Schema(description = "自提门店编号", example = "[1,2]")
  38 + private List<Long> pickUpStoreIds;
  39 +
33 40 @Schema(description = "收件人名称", example = "小红")
34 41 private String receiverName;
35 42  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderRemarkReqVO.java 0 → 100644
  View file @4c63424
  1 +package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import javax.validation.constraints.NotEmpty;
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@Schema(description = "管理后台 - 订单备注 Request VO")
  10 +@Data
  11 +public class TradeOrderRemarkReqVO {
  12 +
  13 + @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  14 + @NotNull(message = "订单编号不能为空")
  15 + private Long id;
  16 +
  17 + @Schema(description = "商家备注", example = "你猜一下")
  18 + @NotEmpty(message = "订单备注不能为空")
  19 + private String remark;
  20 +
  21 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/delivery/AppDeliverExpressController.java
  View file @4c63424
... ... @@ -31,7 +31,7 @@ public class AppDeliverExpressController {
31 31 @GetMapping("/list")
32 32 @Operation(summary = "获得快递公司列表")
33 33 public CommonResult<List<AppDeliveryExpressRespVO>> getDeliveryExpressList() {
34   - List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressList(CommonStatusEnum.ENABLE.getStatus());
  34 + List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
35 35 list.sort(Comparator.comparing(DeliveryExpressDO::getSort));
36 36 return success(DeliveryExpressConvert.INSTANCE.convertList03(list));
37 37 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressConvert.java
  View file @4c63424
1 1 package cn.iocoder.yudao.module.trade.convert.delivery;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.*;
4 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressCreateReqVO;
5 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressExcelVO;
6 7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressRespVO;
... ... @@ -29,6 +30,7 @@ public interface DeliveryExpressConvert {
29 30  
30 31 List<DeliveryExpressExcelVO> convertList02(List<DeliveryExpressDO> list);
31 32  
  33 + List<DeliveryExpressSimpleRespVO> convertList1(List<DeliveryExpressDO> list);
32 34 List<AppDeliveryExpressRespVO> convertList03(List<DeliveryExpressDO> list);
33 35  
34 36 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryPickUpStoreConvert.java
  View file @4c63424
1 1 package cn.iocoder.yudao.module.trade.convert.delivery;
2 2  
3   -import java.util.*;
4   -
5 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6   -
7 4 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
8 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
9   -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExcelVO;
10 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreRespVO;
  7 +import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreSimpleRespVO;
11 8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
12 9 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
13 10 import org.mapstruct.Mapper;
14   -import org.mapstruct.Mapping;
15 11 import org.mapstruct.Named;
16 12 import org.mapstruct.factory.Mappers;
17 13  
  14 +import java.util.List;
  15 +
18 16 @Mapper
19 17 public interface DeliveryPickUpStoreConvert {
20 18  
... ... @@ -30,14 +28,10 @@ public interface DeliveryPickUpStoreConvert {
30 28  
31 29 PageResult<DeliveryPickUpStoreRespVO> convertPage(PageResult<DeliveryPickUpStoreDO> page);
32 30  
33   - List<DeliveryPickUpStoreExcelVO> convertList02(List<DeliveryPickUpStoreDO> list);
34   -
35   - @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToName")
36   - DeliveryPickUpStoreExcelVO convert2(DeliveryPickUpStoreDO bean);
37   -
38 31 @Named("convertAreaIdToName")
39 32 default String convertAreaIdToName(Integer areaId) {
40 33 return AreaUtils.format(areaId);
41 34 }
42 35  
  36 + List<DeliveryPickUpStoreSimpleRespVO> convertList1(List<DeliveryPickUpStoreDO> list);
43 37 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @4c63424
... ... @@ -17,8 +17,7 @@ import cn.iocoder.yudao.module.promotion.api.combination.dto.CombinationRecordCr
17 17 import cn.iocoder.yudao.module.trade.api.order.dto.TradeOrderRespDTO;
18 18 import cn.iocoder.yudao.module.trade.controller.admin.base.member.user.MemberUserRespVO;
19 19 import cn.iocoder.yudao.module.trade.controller.admin.base.product.property.ProductPropertyValueDetailRespVO;
20   -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDetailRespVO;
21   -import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderPageItemRespVO;
  20 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.*;
22 21 import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
23 22 import cn.iocoder.yudao.module.trade.controller.app.order.vo.*;
24 23 import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemCommentCreateReqVO;
... ... @@ -278,4 +277,10 @@ public interface TradeOrderConvert {
278 277  
279 278 List<AppOrderExpressTrackRespDTO> convertList02(List<ExpressTrackRespDTO> list);
280 279  
  280 + TradeOrderDO convert(TradeOrderAdjustAddressReqVO reqVO);
  281 +
  282 + TradeOrderDO convert(TradeOrderAdjustPriceReqVO reqVO);
  283 +
  284 + TradeOrderDO convert(TradeOrderRemarkReqVO reqVO);
  285 +
281 286 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryPickUpStoreMapper.java
  View file @4c63424
... ... @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6   -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;
7 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
8 7 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
9 8 import org.apache.ibatis.annotations.Mapper;
... ... @@ -23,15 +22,10 @@ public interface DeliveryPickUpStoreMapper extends BaseMapperX&lt;DeliveryPickUpSto
23 22 .orderByDesc(DeliveryPickUpStoreDO::getId));
24 23 }
25 24  
26   - default List<DeliveryPickUpStoreDO> selectList(DeliveryPickUpStoreExportReqVO reqVO) {
27   - return selectList(new LambdaQueryWrapperX<DeliveryPickUpStoreDO>()
28   - .likeIfPresent(DeliveryPickUpStoreDO::getName, reqVO.getName())
29   - .eqIfPresent(DeliveryPickUpStoreDO::getPhone, reqVO.getPhone())
30   - .eqIfPresent(DeliveryPickUpStoreDO::getAreaId, reqVO.getAreaId())
31   - .eqIfPresent(DeliveryPickUpStoreDO::getStatus, reqVO.getStatus())
32   - .betweenIfPresent(DeliveryPickUpStoreDO::getCreateTime, reqVO.getCreateTime())
33   - .orderByDesc(DeliveryPickUpStoreDO::getId));
  25 + default List<DeliveryPickUpStoreDO> selectListByStatus(Integer status) {
  26 + return selectList(DeliveryPickUpStoreDO::getStatus, status);
34 27 }
  28 +
35 29 }
36 30  
37 31  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
  View file @4c63424
... ... @@ -34,6 +34,8 @@ public interface TradeOrderMapper extends BaseMapperX&lt;TradeOrderDO&gt; {
34 34 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
35 35 .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode())
36 36 .eqIfPresent(TradeOrderDO::getTerminal,reqVO.getTerminal())
  37 + .eqIfPresent(TradeOrderDO::getLogisticsId, reqVO.getLogisticsId())
  38 + .inIfPresent(TradeOrderDO::getPickUpStoreId, reqVO.getPickUpStoreIds())
37 39 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime()));
38 40 }
39 41  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressService.java
  View file @4c63424
1 1 package cn.iocoder.yudao.module.trade.service.delivery;
2 2  
  3 +import java.util.*;
  4 +import javax.validation.*;
  5 +
3 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 7 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressCreateReqVO;
5 8 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.DeliveryExpressExportReqVO;
... ... @@ -8,6 +11,7 @@ import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.express.Delive
8 11 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
9 12  
10 13 import javax.validation.Valid;
  14 +import java.util.Collection;
11 15 import java.util.List;
12 16  
13 17 /**
... ... @@ -64,11 +68,10 @@ public interface DeliveryExpressService {
64 68 List<DeliveryExpressDO> getDeliveryExpressList(DeliveryExpressExportReqVO exportReqVO);
65 69  
66 70 /**
67   - * 获得快递公司列表
  71 + * 获取指定状态的快递公司列表
68 72 *
69 73 * @param status 状态
70   - * @return 快递公司列表
  74 + * @return 返回快递公司列表
71 75 */
72   - List<DeliveryExpressDO> getDeliveryExpressList(Integer status);
73   -
  76 + List<DeliveryExpressDO> getDeliveryExpressListByStatus(Integer status);
74 77 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryExpressServiceImpl.java
  View file @4c63424
... ... @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
12 12 import org.springframework.validation.annotation.Validated;
13 13  
14 14 import javax.annotation.Resource;
  15 +import java.util.Collection;
15 16 import java.util.List;
16 17  
17 18 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
... ... @@ -95,7 +96,7 @@ public class DeliveryExpressServiceImpl implements DeliveryExpressService {
95 96 }
96 97  
97 98 @Override
98   - public List<DeliveryExpressDO> getDeliveryExpressList(Integer status) {
  99 + public List<DeliveryExpressDO> getDeliveryExpressListByStatus(Integer status) {
99 100 return deliveryExpressMapper.selectListByStatus(status);
100 101 }
101 102  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreService.java
  View file @4c63424
1 1 package cn.iocoder.yudao.module.trade.service.delivery;
2 2  
3   -import java.util.*;
4   -import javax.validation.*;
5 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 4 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
7   -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;
8 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
9 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
10 7 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
11 8  
  9 +import javax.validation.Valid;
  10 +import java.util.Collection;
  11 +import java.util.List;
  12 +
12 13 /**
13 14 * 自提门店 Service 接口
14 15 *
... ... @@ -63,10 +64,10 @@ public interface DeliveryPickUpStoreService {
63 64 PageResult<DeliveryPickUpStoreDO> getDeliveryPickUpStorePage(DeliveryPickUpStorePageReqVO pageReqVO);
64 65  
65 66 /**
66   - * 获得自提门店列表, 用于 Excel 导出
  67 + * 获得指定状态的自提门店列表
67 68 *
68   - * @param exportReqVO 查询条件
  69 + * @param status 状态
69 70 * @return 自提门店列表
70 71 */
71   - List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreList(DeliveryPickUpStoreExportReqVO exportReqVO);
  72 + List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreListByStatus(Integer status);
72 73 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java
  View file @4c63424
... ... @@ -2,21 +2,20 @@ 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.pickup.DeliveryPickUpStoreCreateReqVO;
5   -import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;
6 5 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
7 6 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
8 7 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
9 8 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
10 9 import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreMapper;
11 10 import org.springframework.stereotype.Service;
12   -import javax.annotation.Resource;
13 11 import org.springframework.validation.annotation.Validated;
14 12  
15   -import java.util.*;
16   -
  13 +import javax.annotation.Resource;
  14 +import java.util.Collection;
  15 +import java.util.List;
17 16  
18 17 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
19   -import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
  18 +import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PICK_UP_STORE_NOT_EXISTS;
20 19  
21 20 /**
22 21 * 自提门店 Service 实现类
... ... @@ -78,7 +77,8 @@ public class DeliveryPickUpStoreServiceImpl implements DeliveryPickUpStoreServic
78 77 }
79 78  
80 79 @Override
81   - public List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreList(DeliveryPickUpStoreExportReqVO exportReqVO) {
82   - return deliveryPickUpStoreMapper.selectList(exportReqVO);
  80 + public List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreListByStatus(Integer status) {
  81 + return deliveryPickUpStoreMapper.selectListByStatus(status);
83 82 }
  83 +
84 84 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
  View file @4c63424
1 1 package cn.iocoder.yudao.module.trade.service.order;
2 2  
  3 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderAdjustAddressReqVO;
  4 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderAdjustPriceReqVO;
3 5 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
  6 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
4 7 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
5 8 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO;
6 9 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO;
... ... @@ -20,7 +23,7 @@ public interface TradeOrderUpdateService {
20 23 /**
21 24 * 获得订单结算信息
22 25 *
23   - * @param userId 登录用户
  26 + * @param userId 登录用户
24 27 * @param settlementReqVO 订单结算请求
25 28 * @return 订单结算结果
26 29 */
... ... @@ -29,8 +32,8 @@ public interface TradeOrderUpdateService {
29 32 /**
30 33 * 【会员】创建交易订单
31 34 *
32   - * @param userId 登录用户
33   - * @param userIp 用户 IP 地址
  35 + * @param userId 登录用户
  36 + * @param userIp 用户 IP 地址
34 37 * @param createReqVO 创建交易订单请求模型
35 38 * @return 交易订单的
36 39 */
... ... @@ -39,7 +42,7 @@ public interface TradeOrderUpdateService {
39 42 /**
40 43 * 更新交易订单已支付
41 44 *
42   - * @param id 交易订单编号
  45 + * @param id 交易订单编号
43 46 * @param payOrderId 支付订单编号
44 47 */
45 48 void updateOrderPaid(Long id, Long payOrderId);
... ... @@ -47,10 +50,9 @@ public interface TradeOrderUpdateService {
47 50 /**
48 51 * 【管理员】发货交易订单
49 52 *
50   - * @param userId 管理员编号
51 53 * @param deliveryReqVO 发货请求
52 54 */
53   - void deliveryOrder(Long userId, TradeOrderDeliveryReqVO deliveryReqVO);
  55 + void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO);
54 56  
55 57 /**
56 58 * 【会员】收货交易订单
... ... @@ -60,12 +62,33 @@ public interface TradeOrderUpdateService {
60 62 */
61 63 void receiveOrder(Long userId, Long id);
62 64  
  65 + /**
  66 + * 【管理员】交易订单备注
  67 + *
  68 + * @param reqVO 请求
  69 + */
  70 + void remarkOrder(TradeOrderRemarkReqVO reqVO);
  71 +
  72 + /**
  73 + * 调整价格
  74 + *
  75 + * @param reqVO 请求
  76 + */
  77 + void adjustPrice(TradeOrderAdjustPriceReqVO reqVO);
  78 +
  79 + /**
  80 + * 调整地址
  81 + *
  82 + * @param reqVO 请求
  83 + */
  84 + void adjustAddress(TradeOrderAdjustAddressReqVO reqVO);
  85 +
63 86 // =================== Order Item ===================
64 87  
65 88 /**
66 89 * 更新交易订单项的售后状态
67 90 *
68   - * @param id 交易订单项编号
  91 + * @param id 交易订单项编号
69 92 * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常
70 93 * @param newAfterSaleStatus 目标售后状态
71 94 */
... ... @@ -76,11 +99,11 @@ public interface TradeOrderUpdateService {
76 99 /**
77 100 * 更新交易订单项的售后状态
78 101 *
79   - * @param id 交易订单项编号
  102 + * @param id 交易订单项编号
80 103 * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常
81 104 * @param newAfterSaleStatus 目标售后状态
82   - * @param afterSaleId 售后单编号；当订单项发起售后时，必须传递该字段
83   - * @param refundPrice 退款金额；当订单项退款成功时，必须传递该值
  105 + * @param afterSaleId 售后单编号；当订单项发起售后时，必须传递该字段
  106 + * @param refundPrice 退款金额；当订单项退款成功时，必须传递该值
84 107 */
85 108 void updateOrderItemAfterSaleStatus(Long id, Integer oldAfterSaleStatus, Integer newAfterSaleStatus,
86 109 Long afterSaleId, Integer refundPrice);
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
  View file @4c63424
... ... @@ -29,7 +29,10 @@ import cn.iocoder.yudao.module.promotion.api.combination.dto.CombinationRecordUp
29 29 import cn.iocoder.yudao.module.promotion.api.coupon.CouponApi;
30 30 import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponUseReqDTO;
31 31 import cn.iocoder.yudao.module.promotion.enums.combination.CombinationRecordStatusEnum;
  32 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderAdjustAddressReqVO;
  33 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderAdjustPriceReqVO;
32 34 import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderDeliveryReqVO;
  35 +import cn.iocoder.yudao.module.trade.controller.admin.order.vo.TradeOrderRemarkReqVO;
33 36 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderCreateReqVO;
34 37 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementReqVO;
35 38 import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeOrderSettlementRespVO;
... ... @@ -53,6 +56,7 @@ import cn.iocoder.yudao.module.trade.service.price.TradePriceService;
53 56 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
54 57 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
55 58 import lombok.extern.slf4j.Slf4j;
  59 +import org.jetbrains.annotations.NotNull;
56 60 import org.springframework.stereotype.Service;
57 61 import org.springframework.transaction.annotation.Transactional;
58 62  
... ... @@ -64,6 +68,7 @@ import java.util.Objects;
64 68 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
65 69 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
66 70 import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_NOT_FOUND;
  71 +import static cn.iocoder.yudao.module.pay.enums.ErrorCodeConstants.ORDER_PAID_NO_ADJUST_PRICE;
67 72 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
68 73  
69 74 /**
... ... @@ -345,10 +350,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
345 350 */
346 351 private KeyValue<TradeOrderDO, PayOrderRespDTO> validateOrderPayable(Long id, Long payOrderId) {
347 352 // 校验订单是否存在
348   - TradeOrderDO order = tradeOrderMapper.selectById(id);
349   - if (order == null) {
350   - throw exception(ORDER_NOT_FOUND);
351   - }
  353 + TradeOrderDO order = validateOrder(id);
352 354 // 校验订单未支付
353 355 if (!TradeOrderStatusEnum.isUnpaid(order.getStatus()) || order.getPayStatus()) {
354 356 log.error("[validateOrderPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]",
... ... @@ -391,14 +393,14 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
391 393  
392 394 @Override
393 395 @Transactional(rollbackFor = Exception.class)
394   - public void deliveryOrder(Long userId, TradeOrderDeliveryReqVO deliveryReqVO) {
  396 + public void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO) {
395 397 // TODO @puhui999：只有选择快递的，才可以发货
396 398 // 1.1 校验并获得交易订单（可发货）
397 399 TradeOrderDO order = validateOrderDeliverable(deliveryReqVO.getId());
398 400 TradeOrderDO updateOrderObj = new TradeOrderDO();
399 401 // 判断发货类型
400 402 // 2.1 快递发货
401   - if (Objects.equals(deliveryReqVO.getType(), DeliveryTypeEnum.EXPRESS.getMode())) {
  403 + if (ObjectUtil.notEqual(deliveryReqVO.getLogisticsId(), 0L)) {
402 404 // 校验快递公司
403 405 DeliveryExpressDO deliveryExpress = deliveryExpressService.getDeliveryExpress(deliveryReqVO.getLogisticsId());
404 406 if (deliveryExpress == null) {
... ... @@ -408,11 +410,9 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
408 410 throw exception(EXPRESS_STATUS_NOT_ENABLE);
409 411 }
410 412 updateOrderObj.setLogisticsId(deliveryReqVO.getLogisticsId()).setLogisticsNo(deliveryReqVO.getLogisticsNo()).setDeliveryType(DeliveryTypeEnum.EXPRESS.getMode());
411   - }
412   - // TODO @puhui999：无需发货时，更新 logisticsId 为 0；
413   - // 2.2 无需发货
414   - if (Objects.equals(deliveryReqVO.getType(), DeliveryTypeEnum.NULL.getMode())) {
415   - updateOrderObj.setLogisticsId(null).setLogisticsNo("").setDeliveryType(DeliveryTypeEnum.NULL.getMode());
  413 + } else {
  414 + // 2.2 无需发货
  415 + updateOrderObj.setLogisticsId(0L).setLogisticsNo("").setDeliveryType(DeliveryTypeEnum.NULL.getMode());
416 416 }
417 417  
418 418 // 更新 TradeOrderDO 状态为已发货，等待收货
... ... @@ -425,7 +425,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
425 425  
426 426 // 发送站内信
427 427 tradeMessageService.sendMessageWhenDeliveryOrder(new TradeOrderMessageWhenDeliveryOrderReqBO().setOrderId(order.getId())
428   - .setUserId(userId).setMessage(null));
  428 + .setUserId(order.getUserId()).setMessage(null));
429 429  
430 430 // TODO 芋艿：OrderLog
431 431 // TODO 设计：lili：是不是发货后，才支持售后？
... ... @@ -440,11 +440,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
440 440 * @return 交易订单
441 441 */
442 442 private TradeOrderDO validateOrderDeliverable(Long id) {
443   - // 校验订单是否存在
444   - TradeOrderDO order = tradeOrderMapper.selectById(id);
445   - if (order == null) {
446   - throw exception(ORDER_NOT_FOUND);
447   - }
  443 + TradeOrderDO order = validateOrder(id);
448 444 // 校验订单是否是待发货状态
449 445 if (!TradeOrderStatusEnum.isUndelivered(order.getStatus())) {
450 446 throw exception(ORDER_DELIVERY_FAIL_STATUS_NOT_UNDELIVERED);
... ... @@ -470,6 +466,16 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
470 466 return order;
471 467 }
472 468  
  469 + @NotNull
  470 + private TradeOrderDO validateOrder(Long id) {
  471 + // 校验订单是否存在
  472 + TradeOrderDO order = tradeOrderMapper.selectById(id);
  473 + if (order == null) {
  474 + throw exception(ORDER_NOT_FOUND);
  475 + }
  476 + return order;
  477 + }
  478 +
473 479 @Override
474 480 @Transactional(rollbackFor = Exception.class)
475 481 public void receiveOrder(Long userId, Long id) {
... ... @@ -489,6 +495,42 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
489 495 // TODO 芋艿：lili 发送商品被购买完成的数据
490 496 }
491 497  
  498 + @Override
  499 + public void remarkOrder(TradeOrderRemarkReqVO reqVO) {
  500 + // 校验并获得交易订单
  501 + validateOrder(reqVO.getId());
  502 +
  503 + // 更新
  504 + TradeOrderDO order = TradeOrderConvert.INSTANCE.convert(reqVO);
  505 + tradeOrderMapper.updateById(order);
  506 + }
  507 +
  508 + @Override
  509 + public void adjustPrice(TradeOrderAdjustPriceReqVO reqVO) {
  510 + // 校验交易订单
  511 + TradeOrderDO order = validateOrder(reqVO.getId());
  512 + if (order.getPayStatus()) {
  513 + throw exception(ORDER_PAID_NO_ADJUST_PRICE);
  514 + }
  515 +
  516 + // 更新
  517 + TradeOrderDO update = TradeOrderConvert.INSTANCE.convert(reqVO);
  518 + update.setPayPrice(update.getPayPrice() + update.getAdjustPrice());
  519 + tradeOrderMapper.updateById(update);
  520 + }
  521 +
  522 + @Override
  523 + public void adjustAddress(TradeOrderAdjustAddressReqVO reqVO) {
  524 + // 校验交易订单
  525 + validateOrder(reqVO.getId());
  526 + // TODO 是否需要校验订单是否发货
  527 + // TODO 发货后是否支持修改收货地址
  528 +
  529 + // 更新
  530 + TradeOrderDO update = TradeOrderConvert.INSTANCE.convert(reqVO);
  531 + tradeOrderMapper.updateById(update);
  532 + }
  533 +
492 534 /**
493 535 * 校验交易订单满足可售货的条件
494 536 *
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceTest.java
  View file @4c63424
... ... @@ -56,6 +56,7 @@ public class TradeAfterSaleServiceTest extends BaseDbUnitTest {
56 56 private TradeOrderUpdateService tradeOrderUpdateService;
57 57 @Resource
58 58 private TradeOrderQueryService tradeOrderQueryService;
  59 +
59 60 @MockBean
60 61 private PayRefundApi payRefundApi;
61 62  
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceTest.java
  View file @4c63424
... ... @@ -23,7 +23,10 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
23 23 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
24 24 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderItemMapper;
25 25 import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper;
26   -import cn.iocoder.yudao.module.trade.enums.order.*;
  26 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemAfterSaleStatusEnum;
  27 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
  28 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
  29 +import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
27 30 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderConfig;
28 31 import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
29 32 import org.junit.jupiter.api.BeforeEach;
... ... @@ -38,7 +41,6 @@ import java.util.List;
38 41  
39 42 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
40 43 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
41   -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
42 44 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
43 45 import static java.util.Collections.singletonList;
44 46 import static org.junit.jupiter.api.Assertions.*;
... ... @@ -282,7 +284,7 @@ public class TradeOrderUpdateServiceTest extends BaseDbUnitTest {
282 284 // mock 方法（支付单）
283 285  
284 286 // 调用
285   - tradeOrderUpdateService.deliveryOrder(randomLongId(), deliveryReqVO);
  287 + tradeOrderUpdateService.deliveryOrder(deliveryReqVO);
286 288 // 断言
287 289 TradeOrderDO dbOrder = tradeOrderMapper.selectById(1L);
288 290 assertEquals(dbOrder.getStatus(), TradeOrderStatusEnum.DELIVERED.getStatus());
... ...
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
  View file @4c63424
... ... @@ -27,6 +27,7 @@ public interface ErrorCodeConstants {
27 27 ErrorCode ORDER_IS_EXPIRED = new ErrorCode(1007002003, "支付订单已经过期");
28 28 ErrorCode ORDER_SUBMIT_CHANNEL_ERROR = new ErrorCode(1007002004, "发起支付报错，错误码：{}，错误提示：{}");
29 29 ErrorCode ORDER_REFUND_FAIL_STATUS_ERROR = new ErrorCode(1007002005, "支付订单退款失败，原因：状态不是已支付或已退款");
  30 + ErrorCode ORDER_PAID_NO_ADJUST_PRICE = new ErrorCode(1007002006, "支付订单调价失败，原因：支付订单已付款,不能调价");
30 31  
31 32 // ========== ORDER 模块(拓展单) 1007003000 ==========
32 33 ErrorCode ORDER_EXTENSION_NOT_FOUND = new ErrorCode(1007003000, "支付交易拓展单不存在");
... ...