From fddf121cd7b9b488d7fd529bd3e64461d65b9f20 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 01 Sep 2022 16:01:33 +0800
Subject: [PATCH] 20220822

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 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 a619ce4..917b67b 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
@@ -74,6 +74,7 @@
     private final MallTeamLeaderMapper mallTeamLeaderMapper;
     private final MallMemberMapper mallMemberMapper;
     private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+    private final MallLeaderAchieveMapper mallLeaderAchieveMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -294,7 +295,7 @@
                 wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
                 payResultStr = brandWCPayRequestData.getPrepay_id();
                 orderInfo.setPayMethod("微信支付");
-                agentProducer.sendOrderReturn(orderInfo.getId());
+//                agentProducer.sendOrderReturn(orderInfo.getId());
                 break;
             case "2":
                 if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {
@@ -315,6 +316,7 @@
                 orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
                 orderInfo.setPayTime(new Date());
                 orderInfo.setPayResult("1");
+                orderInfo.setDeliveryState(OrderDeliveryStateEnum.DELIVERY_WAIT.getValue());
 
 //                boolean hasTc = false;
 //                // 静态倍数
@@ -484,6 +486,15 @@
         orderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
         orderInfo.setReceivingTime(new Date());
         this.baseMapper.updateById(orderInfo);
+
+        //生成一条团长提成记录
+        MallLeaderAchieve mallLeaderAchieve = new MallLeaderAchieve();
+        mallLeaderAchieve.setMemberId(orderInfo.getMemberId());
+        mallLeaderAchieve.setOrderNo(orderInfo.getOrderNo());
+        mallLeaderAchieve.setAmount(orderInfo.getAmount());
+        mallLeaderAchieve.setUniqueCode(orderInfo.getTakeUniqueCode());
+        mallLeaderAchieve.setState(MallLeaderAchieve.STATE_ONE);
+        mallLeaderAchieveMapper.insert(mallLeaderAchieve);
     }
 
     @Override

--
Gitblit v1.9.1