mall：订单详情：调整售后字段

2025-08-14 10:11:53 +08:00 · 2023-05-21 12:18:52 +08:00
parent e745bb6675
commit e942b52a67
11 changed files with 67 additions and 67 deletions
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.trade.convert.order.TradeOrderConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
+import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
 import cn.iocoder.yudao.module.trade.service.order.TradeOrderService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -46,6 +47,9 @@ public class AppTradeOrderController {
    @Resource
    private ProductPropertyValueApi productPropertyValueApi;

+    @Resource
+    private TradeOrderProperties tradeOrderProperties;
+
    @GetMapping("/settlement")
    @Operation(summary = "获得订单结算信息")
    @PreAuthenticated
@@ -154,7 +158,8 @@ public class AppTradeOrderController {
        List<ProductPropertyValueDetailRespDTO> propertyValueDetails = productPropertyValueApi
                .getPropertyValueDetailList(TradeOrderConvert.INSTANCE.convertPropertyValueIds(orderItems));
        // 最终组合
-        return success(TradeOrderConvert.INSTANCE.convert02(order, orderItems, propertyValueDetails));
+        return success(TradeOrderConvert.INSTANCE.convert02(order, orderItems,
+                propertyValueDetails, tradeOrderProperties));
    }

    @GetMapping("/page")
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.module.trade.controller.app.order.vo;

-import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
+import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

@@ -38,6 +38,9 @@ public class AppTradeOrderDetailRespVO {
    @Schema(description = "订单取消时间")
    private LocalDateTime cancelTime;

+    @Schema(description = "是否评价", required = true, example = "true")
+    private Boolean commentStatus;
+
    // ========== 价格 + 支付基本信息 ==========

    @Schema(description = "是否已支付", required = true, example = "true")
@@ -49,6 +52,9 @@ public class AppTradeOrderDetailRespVO {
    @Schema(description = "付款时间")
    private LocalDateTime payTime;

+    @Schema(description = "付款超时时间", required = true)
+    private LocalDateTime payExpireTime;
+
    @Schema(description = "支付渠道", required = true, example = "wx_lite_pay")
    private String payChannelCode;

@@ -72,6 +78,9 @@ public class AppTradeOrderDetailRespVO {

    // ========== 收件 + 物流基本信息 ==========

+    @Schema(description = "配送方式", required = true, example = "1")
+    private Integer deliveryType;
+
    @Schema(description = "发货物流单号", example = "1024")
    private String logisticsNo;

@@ -112,42 +121,6 @@ public class AppTradeOrderDetailRespVO {
    /**
     * 订单项数组
     */
-    private List<Item> items;
-
-    @Schema(description = "用户 App - 交易订单的分页项的订单项目")
-    @Data
-    public static class Item {
-
-        @Schema(description = "编号", required = true, example = "1")
-        private Long id;
-
-        @Schema(description = "商品 SPU 编号", required = true, example = "1")
-        private Long spuId;
-        @Schema(description = "商品 SPU 名称", required = true, example = "芋道源码")
-        private String spuName;
-
-        @Schema(description = "商品 SKU 编号", required = true, example = "1")
-        private Long skuId;
-
-        /**
-         * 属性数组
-         */
-        private List<AppProductPropertyValueDetailRespVO> properties;
-
-        @Schema(description = "商品图片", required = true, example = "https://www.iocoder.cn/1.png")
-        private String picUrl;
-
-        @Schema(description = "购买数量", required = true, example = "1")
-        private Integer count;
-
-        @Schema(description = "是否评价", required = true, example = "true")
-        private Boolean commentStatus;
-
-        // ========== 价格 + 支付基本信息 ==========
-
-        @Schema(description = "商品原价（单）", required = true, example = "100")
-        private Integer price;
-
-    }
+    private List<AppTradeOrderItemRespVO> items;

 }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
@@ -37,6 +37,11 @@ public class AppTradeOrderPageItemRespVO {
    @Schema(description = "应付金额，单位：分", required = true, example = "1000")
    private Integer payPrice;

+    // ========== 收件 + 物流基本信息 ==========
+
+    @Schema(description = "配送方式", required = true, example = "1")
+    private Integer deliveryType;
+
    /**
     * 订单项数组
     */
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/item/AppTradeOrderItemRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/item/AppTradeOrderItemRespVO.java
@@ -15,25 +15,38 @@ public class AppTradeOrderItemRespVO {

    @Schema(description = "商品 SPU 编号", required = true, example = "1")
    private Long spuId;
-
    @Schema(description = "商品 SPU 名称", required = true, example = "芋道源码")
    private String spuName;

    @Schema(description = "商品 SKU 编号", required = true, example = "1")
    private Long skuId;

+    /**
+     * 属性数组
+     */
+    private List<AppProductPropertyValueDetailRespVO> properties;
+
    @Schema(description = "商品图片", required = true, example = "https://www.iocoder.cn/1.png")
    private String picUrl;

    @Schema(description = "购买数量", required = true, example = "1")
    private Integer count;

+    @Schema(description = "是否评价", required = true, example = "true")
+    private Boolean commentStatus;
+
+    // ========== 价格 + 支付基本信息 ==========
+
    @Schema(description = "商品原价（单）", required = true, example = "100")
    private Integer price;

-    /**
-     * 属性数组
-     */
-    private List<AppProductPropertyValueDetailRespVO> properties;
+    // ========== 营销基本信息 ==========

+    // TODO 芋艿：在捉摸一下
+
+    // ========== 售后基本信息 ==========
+
+    @Schema(description = "售后状态", required = true, example = "1")
+    private Integer afterSaleStatus;
+    
 }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
@@ -212,8 +212,9 @@ public interface TradeOrderConvert {
    AppProductPropertyValueDetailRespVO convert02(ProductPropertyValueDetailRespDTO bean);

    default AppTradeOrderDetailRespVO convert02(TradeOrderDO order, List<TradeOrderItemDO> orderItems,
-                                                List<ProductPropertyValueDetailRespDTO> propertyValueDetails) {
+                                                List<ProductPropertyValueDetailRespDTO> propertyValueDetails, TradeOrderProperties tradeOrderProperties) {
        AppTradeOrderDetailRespVO orderVO = convert3(order, orderItems);
+        orderVO.setPayExpireTime(addTime(tradeOrderProperties.getExpireTime()));
        // 处理商品属性
        Map<Long, ProductPropertyValueDetailRespDTO> propertyValueDetailMap = convertMap(propertyValueDetails, ProductPropertyValueDetailRespDTO::getValueId);
        for (int i = 0; i < orderItems.size(); i++) {
@@ -221,7 +222,7 @@ public interface TradeOrderConvert {
            if (CollUtil.isEmpty(properties)) {
                continue;
            }
-            AppTradeOrderDetailRespVO.Item item = orderVO.getItems().get(i);
+            AppTradeOrderItemRespVO item = orderVO.getItems().get(i);
            item.setProperties(new ArrayList<>(properties.size()));
            // 遍历每个 properties，设置到 TradeOrderPageItemRespVO.Item 中
            properties.forEach(property -> {
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/order/TradeOrderDO.java
@@ -3,8 +3,9 @@ package cn.iocoder.yudao.module.trade.dal.dataobject.order;
 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.promotion.api.price.dto.PriceCalculateRespDTO.OrderItem;
+import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderCancelTypeEnum;
-import cn.iocoder.yudao.module.trade.enums.order.TradeOrderAfterSaleStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderDeliveryStatusEnum;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
@@ -179,6 +180,12 @@ public class TradeOrderDO extends BaseDO {
    private Integer payPrice;

    // ========== 收件 + 物流基本信息 ==========
+    /**
+     * 配送方式
+     *
+     * 枚举 {@link DeliveryTypeEnum}
+     */
+    private Integer deliveryType;
    /**
     * 配置模板的编号
     *
@@ -229,9 +236,9 @@ public class TradeOrderDO extends BaseDO {
    /**
     * 售后状态
     *
-     * 枚举 {@link TradeOrderAfterSaleStatusEnum}
+     * 枚举 {@link TradeOrderRefundStatusEnum}
     */
-    private Integer afterSaleStatus;
+    private Integer refundStatus;
    /**
     * 退款金额，单位：分
     *
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
@@ -178,12 +178,12 @@ public class TradeOrderServiceImpl implements TradeOrderService {
        tradeOrderDO.setNo(IdUtil.getSnowflakeNextId() + ""); // TODO @LeeYan9: 思考下, 怎么生成好点哈; 这个是会展示给用户的;
        tradeOrderDO.setStatus(TradeOrderStatusEnum.UNPAID.getStatus());
        tradeOrderDO.setType(TradeOrderTypeEnum.NORMAL.getType());
-        tradeOrderDO.setAfterSaleStatus(TradeOrderAfterSaleStatusEnum.NONE.getStatus());
+        tradeOrderDO.setRefundStatus(TradeOrderRefundStatusEnum.NONE.getStatus());
        tradeOrderDO.setProductCount(getSumValue(order.getItems(),  PriceCalculateRespDTO.OrderItem::getCount, Integer::sum));
        tradeOrderDO.setTerminal(TerminalEnum.H5.getTerminal()); // todo 数据来源?
        tradeOrderDO.setAdjustPrice(0).setPayed(false); // 支付信息
        tradeOrderDO.setDeliveryStatus(TradeOrderDeliveryStatusEnum.UNDELIVERED.getStatus()); // 物流信息
-        tradeOrderDO.setAfterSaleStatus(TradeOrderAfterSaleStatusEnum.NONE.getStatus()).setRefundPrice(0); // 退款信息
+        tradeOrderDO.setRefundStatus(TradeOrderRefundStatusEnum.NONE.getStatus()).setRefundPrice(0); // 退款信息
        tradeOrderMapper.insert(tradeOrderDO);
        return tradeOrderDO;
    }
@@ -491,7 +491,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
        Integer orderRefundPrice = order.getRefundPrice() + refundPrice;
        if (isAllOrderItemAfterSaleSuccess(order.getId())) { // 如果都售后成功，则需要取消订单
            tradeOrderMapper.updateById(new TradeOrderDO().setId(order.getId())
-                    .setAfterSaleStatus(TradeOrderAfterSaleStatusEnum.ALL.getStatus()).setRefundPrice(orderRefundPrice)
+                    .setRefundStatus(TradeOrderRefundStatusEnum.ALL.getStatus()).setRefundPrice(orderRefundPrice)
                    .setCancelType(TradeOrderCancelTypeEnum.AFTER_SALE_CLOSE.getType()).setCancelTime(LocalDateTime.now()));

            // TODO 芋艿：记录订单日志
@@ -499,7 +499,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
            // TODO 芋艿：站内信？
        } else { // 如果部分售后，则更新退款金额
            tradeOrderMapper.updateById(new TradeOrderDO().setId(order.getId())
-                    .setAfterSaleStatus(TradeOrderAfterSaleStatusEnum.PART.getStatus()).setRefundPrice(orderRefundPrice));
+                    .setRefundStatus(TradeOrderRefundStatusEnum.PART.getStatus()).setRefundPrice(orderRefundPrice));
        }

        // TODO 芋艿：未来如果有分佣，需要更新相关分佣订单为已失效