From 535c81a311bcd54b7ef5aa3f02b3cddc19b854d1 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 16:06:14 +0800
Subject: [PATCH] feat(mall): 新增订单项的积分金额和积分价格字段- 在 MallOrderInfoMapper.xml 中添加了 item_score_amount 和 item_score_price 字段的映射 - 在 MallOrderItem 实体类中添加了 itemScorePrice 字段 - 更新了 selectNewApiOrderListInPage 查询，加入了积分金额和积分价格的计算
---
src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 2d78d52..2e8c672 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
@@ -4,6 +4,10 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
/**
* @author wzy
* @date 2021-09-18
@@ -12,9 +16,38 @@
@ApiModel(value = "AddOrderDto", description = "新增订单接口参数接收类")
public class AddOrderDto {
- @ApiModelProperty(value = "skuID", example = "1")
- private Long skuId;
+ @NotNull(message = "参数不能为空")
+ @ApiModelProperty(value = "地址ID", example = "1")
+ private Long addressId;
- @ApiModelProperty(value = "数量", example = "2")
- private Integer cnt;
+ @ApiModelProperty(value = "提货团长特征码", example = "1")
+ private String takeUniqueCode;
+
+// @ApiModelProperty(value = "配送方式 1：自提 2：快递（默认自提）", example = "1")
+// private Integer deliveryType;
+
+ @ApiModelProperty(value = "订单提交类型", example = "1从购物车提交, 2从商品直接提交")
+ private Integer type;
+
+ @ApiModelProperty(value = "是否送货上门 1：是 2：否", example = "1")
+ private Integer isHome;
+
+ @ApiModelProperty(value = "备注")
+ private String remark;
+
+ @ApiModelProperty(value = "配送费")
+ private BigDecimal deliveryAmount;
+
+ @ApiModelProperty(value = "1-普通订单/2-积分订单")
+ private Integer orderType;
+
+ @ApiModelProperty(value = "会员优惠卷ID")
+ private Long memberCouponId;
+
+ @ApiModelProperty(value = "业绩所属邀请码")
+ private String memberInviteId;
+
+ @ApiModelProperty(value = "商品明细")
+ private List<AddOrderItemDto> items;
+
}
--
Gitblit v1.9.1