From 83ef1bc789566a71eb72a4834dde8a58b256536a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Jan 2024 10:08:12 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   11 ++++-------
 1 files changed, 4 insertions(+), 7 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 2674f4e..e7aa9be 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
@@ -326,9 +326,8 @@
         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");
+//            mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount(), MoneyFlowTypeEnum.REFUND.getValue(), orderInfo.getOrderNo(),  FlowTypeEnum.PRIZE_SCORE.getValue());
+//            memberWalletService.add(orderInfo.getAmount(), member.getId(), "prizeScore");
             return;
         }
 
@@ -454,7 +453,6 @@
                 mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额支付",2);
 
                 agentProducer.sendOrderCoupon(orderInfo.getId());
-                agentProducer.sendGetScoreMsg(orderInfo.getId());
                 break;
             case "4":
                 if (orderInfo.getOrderType() != 2) {
@@ -468,7 +466,7 @@
                 orderInfo.setPayTime(new Date());
                 orderInfo.setPayResult("1");
 
-                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(),  FlowTypeEnum.PRIZE_SCORE.getValue());
+                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), ScoreFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(),  FlowTypeEnum.PRIZE_SCORE.getValue(), null, 2);
                 break;
             default:
 
@@ -584,8 +582,7 @@
         orderInfo.setReceivingTime(new Date());
         this.baseMapper.updateById(orderInfo);
 
-        agentProducer.sendVipLevelUp(orderInfo.getId());
-
+        agentProducer.sendGetScoreMsg(orderInfo.getId());
         //生成一条团长提成记录
 //        Long orderInfoId = orderInfo.getId();
 //        List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(orderInfoId);

--
Gitblit v1.9.1