From 1b08257957a0d7027574460711fe58fd8b693a72 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 25 Jan 2024 21:35:36 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    8 ++++++++
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml                       |    2 +-
 2 files changed, 9 insertions(+), 1 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 923ed98..a612d58 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
@@ -149,6 +149,9 @@
                     orderItem.setSkuImage(mallGoods.getThumb());
                     orderItem.setState(1);
 
+                    if (addOrderDto.getType() == 1) {
+                        mallShoppingCartMapper.delBySkuId(mallGoods.getId(), member.getId());
+                    }
                     total = total.add(amount);
                 } else {
                     MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
@@ -318,7 +321,12 @@
         orderInfo.setCancelType(MallOrderInfo.CANCEL_BY_SELF);
         this.baseMapper.updateById(orderInfo);
 
+        if (orderInfo.getOrderType() == 2) {
 
+            mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount(), MoneyFlowTypeEnum.REFUND.getValue(), orderInfo.getOrderNo(),  FlowTypeEnum.PRIZE_SCORE.getValue());
+            memberWalletService.add(orderInfo.getAmount(), member.getId(), "prizeScore");
+            return;
+        }
 
         List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfo.getId());
         if(CollUtil.isNotEmpty(mallOrderItemList)){
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 7a5741d..e79c710 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -215,7 +215,7 @@
             a.status,
             count(1) cnt
         from mall_order_info a
-        where a.del_flag=2 and a.member_id=#{memberId}
+        where a.del_flag=2 and a.member_id=#{memberId} and order_type = 1
         group by a.status
     </select>
 

--
Gitblit v1.9.1