From 511983beb4ecf452f821fd85be497710959cb4cd Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 25 六月 2019 11:04:42 +0800
Subject: [PATCH] 调整淘礼金

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
index 221814e..f76c584 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
@@ -34,6 +34,7 @@
 import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
 import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
 import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinReportService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserMoneyExtraService;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.RedisManager;
@@ -78,6 +79,8 @@
 	@Resource
 	private UserOtherMsgNotificationService userOtherMsgNotificationService;
 	
+	@Resource
+	private UserInfoExtraService userInfoExtraService;
 	
 	
 	@Override
@@ -108,7 +111,8 @@
 		} catch (ParseException e2) {
 			e2.printStackTrace();
 		}
-		BigDecimal perface = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods);
+		// 鏂颁汉绾㈠寘 鑷喘涓�鍏�
+		BigDecimal perface = new BigDecimal(1);
 		
 		return createUserTaoLiJin(1, uid, goods.getAuctionId(), perface, 1, name, sendStartTime,
 					sendEndTime, null, useEndTime);
@@ -138,7 +142,21 @@
 			e2.printStackTrace();
 		}
 		
-		BigDecimal perface = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods);
+		boolean isNewUser = userInfoExtraService.isNewUser(uid);
+		if (isNewUser) {
+			// 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
+			long countRecord = userTaoLiJinRecordMapper.countRecordByUid(uid);
+			if (countRecord > 0) {
+				isNewUser = false;
+			}
+		}
+		
+		BigDecimal perface = null;
+		if (isNewUser) {
+			perface = new BigDecimal(1);
+		} else {
+			perface = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods);
+		}
 		
 		return createUserTaoLiJin(2, uid, goods.getAuctionId(), perface, totalNum, name, sendStartTime,
 					sendEndTime, null, useEndTime);

--
Gitblit v1.8.0