From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 17:50:05 +0800
Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑，使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义，确保数据展示正确 - 更新 buyVipList.html 中状态颜色，以更直观地显示不同状态
---
src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 71fe23b..2e8c672 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java
@@ -5,6 +5,7 @@
import lombok.Data;
import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -34,9 +35,18 @@
@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