From 34c755eb76b677201cadb2acb8ed5fff1f96dc27 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 23 Jan 2024 14:06:34 +0800
Subject: [PATCH] 发票

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 5fe8162..eb52989 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -863,9 +863,10 @@
                     mallProductBuy.setMateState(ProductEnum.PRODUCT_BUY_MATE_STATE_SUCCESS.getValue());
                     mallProductBuyMapper.updateById(mallProductBuy);
                     BigDecimal nftTotal = mallProductBuy.getNftTotal();
-                    insertSell(mallProductBuy.getMemberId(),nftTotal,nftTotal,BigDecimal.ZERO,BigDecimal.ZERO);
                     BigDecimal profit = nftTotal.multiply(profitPercent.multiply(new BigDecimal(0.01)));
-                    insertSell(mallProductBuy.getMemberId(),profit,profit,BigDecimal.ZERO,BigDecimal.ZERO);
+                    BigDecimal add = nftTotal.add(profit);
+                    insertSell(mallProductBuy.getMemberId(),add,add,BigDecimal.ZERO,BigDecimal.ZERO);
+//                    insertSell(mallProductBuy.getMemberId(),profit,profit,BigDecimal.ZERO,BigDecimal.ZERO);
 
                     /**
                      * 更新用户上级收益,冻结7天,7天时间到期自动释放到动态钱包
@@ -923,7 +924,8 @@
                                 );
                                 TeamPerkDto teamPerkDto = JSONObject.parseObject(dataDictionaryCustom.getValue(), TeamPerkDto.class);
                                 if(compareLevel == 0){//团队奖励
-                                    BigDecimal PerkPercent = new BigDecimal(teamPerkDto.getPerkPercent());
+                                    BigDecimal PerkPercent = new BigDecimal(teamPerkDto.getPerkPercent())
+                                            .multiply(new BigDecimal("0.01"));
                                     BigDecimal teamPerk = PerkPercent.multiply(profit).setScale(2,BigDecimal.ROUND_DOWN);
                                     /**
                                      * 先插入流水记录,然后定时器循环,找寻对应的数据执行
@@ -943,7 +945,8 @@
                                     equalsPerkBasic = teamPerk;
                                     level = levelRef;
                                 }else if(compareLevel == 2){//平级奖励
-                                    BigDecimal equalsPerkPercent = new BigDecimal(teamPerkDto.getEqualsPerkPercent());
+                                    BigDecimal equalsPerkPercent = new BigDecimal(teamPerkDto.getEqualsPerkPercent())
+                                            .multiply(new BigDecimal("0.01"));
                                     BigDecimal equalsPerk = equalsPerkPercent.multiply(equalsPerkBasic).setScale(2,BigDecimal.ROUND_DOWN);
                                     String orderNo = MallUtils.getOrderNum("PJNFT");
                                     if(equalsPerk.compareTo(BigDecimal.ZERO) > 0){

--
Gitblit v1.9.1