From 3ed8155add4a6c60c75abdf8bb3fa6d5d6b5b460 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 27 Jul 2023 10:59:49 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java | 4 ++--
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
index c3bb84e..0b4a0e4 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
@@ -23,8 +23,8 @@
@ApiModelProperty(value = "提货团长特征码", example = "1")
private String takeUniqueCode;
-// @ApiModelProperty(value = "配送方式 1：自提 2：快递（默认自提）", example = "1")
-// private Integer deliveryType;
+ @ApiModelProperty(value = "配送方式 1：自提 2：快递（默认自提）", example = "1")
+ private Integer deliveryType;
@ApiModelProperty(value = "订单提交类型", example = "1从购物车提交, 2从商品直接提交")
private Integer type;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 4605836..2d691b5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -111,7 +111,7 @@
orderInfo.setStatus(OrderStatusEnum.WAIT_PAY.getValue());
orderInfo.setRemark(addOrderDto.getRemark());
orderInfo.setOrderType(addOrderDto.getOrderType());
- orderInfo.setDeliveryType(2);
+ orderInfo.setDeliveryType(addOrderDto.getDeliveryType() == null ? 2 : addOrderDto.getDeliveryType());
if (CollUtil.isEmpty(addOrderDto.getItems())) {
throw new FebsException("参数错误");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
index 012f7be..1b7867b 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java
@@ -124,5 +124,8 @@
private Integer deliveryState;
@ApiModelProperty(value = "是否送货上门 1：是 2：否")
private Integer isHome;
+ @ApiModelProperty(value = "配送方式 1：自提 2：快递")
+ private Integer deliveryType;
+
}
--
Gitblit v1.9.1