From e16ab23cc4b872436edf3743f7e9e5639c45d770 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 15:40:59 +0800
Subject: [PATCH] modify

---
 src/main/resources/mapper/yunding/YdOrderDao.xml                                      |    7 +++++++
 src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java                    |    2 ++
 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java |    7 +++++++
 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java   |    2 --
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
index 3d7d628..3ae4c38 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/dao/YdOrderDao.java
@@ -30,4 +30,6 @@
     IPage<AgentVo> getAgentList(Page<AgentVo> page, @Param("record")  YdBasicLevelSettingEntity ydBasicLevelSettingEntity);
 
     List<YdOrderEntity> selectTeamAllPower(@Param("inviteId") String inviteId);
+
+    int updateOrderProfit(@Param("profit") BigDecimal profit, @Param("id") Long id);
 }
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
index 8b530e4..6a26bdb 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
@@ -16,6 +16,7 @@
 import com.xcong.excoin.modules.yunding.entity.YdOrderEntity;
 import com.xcong.excoin.modules.yunding.entity.YdProductEntity;
 import com.xcong.excoin.modules.yunding.service.XchProfitService;
+import com.xcong.excoin.rabbit.producer.YunDingProducter;
 import com.xcong.excoin.utils.LogRecordUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,9 @@
 
     @Autowired
     private YdBasicLevelSettingDao ydBasicLevelSettingDao;
+
+    @Autowired
+    private YunDingProducter yunDingProducter;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -147,6 +151,8 @@
     public void usdtProfitDistributorByOrderId(Long id) {
         YdOrderEntity ydOrderEntity = ydOrderDao.selectById(id);
         usdtProfitDistributor(ydOrderEntity);
+
+        yunDingProducter.sendYunDingAutoAgent(ydOrderEntity.getMemberId());
     }
 
     private void usdtProfitDistributor(YdOrderEntity order) {
@@ -262,6 +268,7 @@
                     LogRecordUtils.insertMemberAccountMoneyChangeWithId(order.getMemberId(), content, remainProfit, "XCH", 1, 4, order.getId());
                     MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(order.getMemberId(), "XCH");
 
+                    ydOrderDao.updateOrderProfit(remainProfit, order.getId());
                     memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), remainProfit, BigDecimal.ZERO, 0);
                 }
             }
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
index 18af7ab..12d3ea6 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
@@ -280,7 +280,6 @@
                 "USDT", 1, 3, ydOrderEntity.getId());
 
         yunDingProducter.sendYunDingUsdtProfit(ydOrderEntity.getId());
-        yunDingProducter.sendYunDingAutoAgent(ydOrderEntity.getMemberId());
         return Result.ok("支付成功");
     }
 
@@ -585,7 +584,6 @@
 
         memberEntity.setAgentLevel(id.intValue());
         LoginUserUtils.resetAppLoginUser(memberEntity);
-        yunDingProducter.sendYunDingAutoAgent(memberId);
         yunDingProducter.sendYunDingUsdtProfit(orderEntity.getId());
         return Result.ok("购买成功");
     }
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index 3075f61..b74d39f 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -96,4 +96,11 @@
         inner join yd_product c on c.id = a.product_id
         where a.type=1
     </select>
+
+    <update id="updateOrderProfit">
+        update yd_order
+            set total_profit=total_profit+#{profit},
+                today_profit=#{profit}
+        where id=#{id}
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1