From 17ee2c1ef2b679eb657db34286c244544e8f68cb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 13 May 2021 11:21:36 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding

---
 src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

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 40804cf..484174c 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
@@ -101,6 +101,12 @@
             }
             for(YdProductVo ydProductVo : records){
                 ydProductVo.setProfitT(prifitT);
+
+                if(ydProductVo.getTotalT().compareTo(BigDecimal.ZERO) < 1) {
+                    ydProductVo.setStatus(2);
+                } else {
+                    ydProductVo.setStatus(1);
+                }
             }
         }
 
@@ -495,6 +501,10 @@
         }
 
         BigDecimal salePrice = ydBasicLevelSettingEntityTo.getSalePrice();
+        //用户如果已经有等级则减少差价
+        if(levelNow != 0){
+            salePrice = salePrice.subtract(ydBasicLevelSettingEntityNow.getSalePrice());
+        }
         //获取用户当前USDT余额
         MemberWalletCoinEntity usdt = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, "USDT");
         BigDecimal availableBalance = usdt.getAvailableBalance();

--
Gitblit v1.9.1