From bc11d703dd68efb9fe068a42cc8252d1adc49d9c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 12 Aug 2023 17:42:59 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/dto/AddOrderDto.java | 8 +++++++-
src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java | 13 +++++++++++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 5 +++++
3 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/AddOrderDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/AddOrderDto.java
index 7c0ed9d..8bc7f7f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/dto/AddOrderDto.java
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/AddOrderDto.java
@@ -14,9 +14,15 @@
@ApiModelProperty(value = "商品ID", example = "1")
private Long goodsId;
-
@NotNull(message = "参数不能为空")
@ApiModelProperty(value = "数量", example = "1")
private Integer goodsCnt;
+ @NotNull(message = "参数不能为空")
+ @ApiModelProperty(value = "地址ID", example = "1")
+ private Long addressId;
+
+ @ApiModelProperty(value = "配送方式 1：快递寄送2：到店自提")
+ private Integer deliverType;
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java b/src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java
index f49b270..592fc0b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/MallOrderInfo.java
@@ -3,8 +3,10 @@
import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -50,6 +52,17 @@
*/
private Integer orderType;
+ private Long addressId;
+
+ private Integer deliverType;
+ //发货状态：1：待发货2：已发货3：已签收
+ private Integer deliverState;
+ public static final Integer DELIVER_STATUS_WAIT = 1;
+ public static final Integer DELIVER_STATUS_DONE = 2;
+ public static final Integer DELIVER_STATUS_OVER = 3;
+ private String deliverName;
+ private String deliverCode;
+
@TableField(exist = false)
private String address;
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 3131500..415f45f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -649,6 +649,10 @@
mallOrderInfo.setOrderTime(DateUtil.date());
mallOrderInfo.setAmount(totalAmount);
mallOrderInfo.setStatus(MallOrderInfo.STATUS_WAIT);
+ mallOrderInfo.setDeliverType(addOrderDto.getDeliverType());
+ if(1 == addOrderDto.getDeliverType()){
+ mallOrderInfo.setAddressId(addOrderDto.getAddressId());
+ }
mallOrderInfo.setOrderType(1);
mallOrderInfoMapper.insert(mallOrderInfo);
MallOrderItem mallOrderItem = new MallOrderItem();
@@ -743,6 +747,7 @@
orderInfo.setPayMethod("余额支付");
orderInfo.setPayResult(1);
orderInfo.setStatus(MallOrderInfo.STATUS_PAY);
+ orderInfo.setDeliverState(MallOrderInfo.DELIVER_STATUS_WAIT);
mallOrderInfoMapper.updateById(orderInfo);
/**
* 更新用户余额
--
Gitblit v1.9.1