From 3f85414c100b8d882e2fd67dfc1d5de0cbc4adc6 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 16:25:49 +0800
Subject: [PATCH] feat(mall): 订单商品信息中增加商品金额和积分价格字段

---
 src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java     |   10 +++++++---
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml |    2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java
index 63c5fd5..87369e7 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java
@@ -1,5 +1,6 @@
 package cc.mrbird.febs.mall.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -54,9 +55,12 @@
     @ApiModelProperty(value = "1:正常 2:退款中3:已退")
     private Integer state;
 
-    @ApiModelProperty(value = "订单积分")
-    private BigDecimal itemScore;
-
     @ApiModelProperty(value = "支付金额")
     private BigDecimal itemAmount;
+
+    @TableField(exist = false)
+    private BigDecimal itemScoreAmount;
+
+    @TableField(exist = false)
+    private BigDecimal itemScorePrice;
 }
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 5bf8ca4..eda3371 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -398,6 +398,7 @@
             <result property="skuId" column="sku_id" />
             <result property="goodsName" column="goods_name" />
             <result property="itemScoreAmount" column="item_score_amount" />
+            <result property="itemAmount" column="item_amount" />
             <result property="itemScorePrice" column="item_score_price" />
             <result property="goodsName" column="goods_name" />
             <result property="styleName" column="style_name" />
@@ -417,6 +418,7 @@
         select
         a.* ,
         b.* ,
+        b.amount as item_amount ,
         b.score_amount as item_score_amount ,
         FLOOR(c.original_price * d.static_prop) as item_score_price ,
                express.express_no

--
Gitblit v1.9.1