From 5d17f725bb5bb51108aaba4230b5a0e5789a825d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 10 May 2022 17:27:10 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java                           |    3 +++
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    2 ++
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml                       |    1 +
 3 files changed, 6 insertions(+), 0 deletions(-)

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 bc4c6a5..1e77831 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
@@ -114,6 +114,8 @@
                 orderItem.setStyleName(mallGoods.getGoodsName());
                 orderItem.setSkuName(mallGoods.getGoodsName());
                 orderItem.setSkuImage(mallGoods.getThumb());
+
+                total = total.add(amount);
             } else {
                 MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
                 if (sku == null) {
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
index 85089a9..ddfb13e 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java
@@ -33,4 +33,7 @@
 
     @ApiModelProperty(value = "订单明细")
     private List<OrderItemVo> items;
+
+    @ApiModelProperty(value = "订单类型 1-普通订单 2-积分订单")
+    private Integer orderType;
 }
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index d72aa95..7675a74 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -55,6 +55,7 @@
         <result column="address" property="address" />
         <result column="longitude" property="longitude" />
         <result column="latitude" property="latitude" />
+        <result column="order_type" property="orderType" />
         <result column="remark" property="remark" />
         <result column="del_flag" property="delFlag" />
         <collection property="items" ofType="cc.mrbird.febs.mall.entity.MallOrderItem">

--
Gitblit v1.9.1