From ea59b5ea251e456fcdba955504972fdb81472284 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 25 六月 2019 14:44:31 +0800
Subject: [PATCH] 版本区分 以及 分享链接调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index 81a7215..437041e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -100,6 +100,7 @@
import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
+import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
@@ -256,6 +257,10 @@
@Resource
private DeviceSexService deviceSexService;
+
+ @Resource
+ private UserTaoLiJinRecordService userTaoLiJinRecordService;
+
@@ -2180,9 +2185,29 @@
// 鎺ㄥ箍绾㈠寘
if (from != null && from.equals("taolijin")) {
+ BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods);
+ // 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
+ if (spreadMoney.compareTo(new BigDecimal(1)) < 0) {
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
+ return;
+ }
+
// 鏄惁涓烘柊鐢ㄦ埛
boolean isNewUser = userInfoExtraService.isNewUser(uid);
- if (!isNewUser) {
+ if (isNewUser) {
+ // 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
+ long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
+ if (countRecord > 0) {
+ isNewUser = false;
+ }
+ }
+
+ SpreadHongBao spreadHongBao = new SpreadHongBao();
+ if (isNewUser) {
+ spreadHongBao.setMoney("1");
+ } else {
+ spreadHongBao.setMoney(spreadMoney.toString());
+
moneyType = 2;
fanliValid = false;
ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO();
@@ -2195,7 +2220,7 @@
textStyleVO3.setContent("锛屽ソ鍙�");
textStyleVO3.setColor("#666666");
ClientTextStyleVO textStyleVO4 = new ClientTextStyleVO();
- textStyleVO4.setContent("棰嗙孩鍖�");
+ textStyleVO4.setContent("棰嗙孩鍖咃紒");
textStyleVO4.setColor("#F14242");
List<ClientTextStyleVO> listText = new ArrayList<ClientTextStyleVO>();
@@ -2206,18 +2231,8 @@
data.put("listTip", listText);
}
-
- BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods);
- // 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
- if (spreadMoney.compareTo(new BigDecimal(1)) < 0) {
- out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
- return;
- }
- SpreadHongBao spreadHongBao = new SpreadHongBao();
- spreadHongBao.setMoney(spreadMoney.toString());
spreadHongBao.setTip("褰撴棩棰嗗彇锛屼袱澶╁唴浣跨敤锛岃繃鏃舵棤鏁�");
goodsJson.put("spreadHongBao", spreadHongBao);
-
// 鐢ㄦ埛鍓╀綑鍙互娣樼ぜ閲戦獙璇�
UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
@@ -2488,6 +2503,10 @@
continue;
}
+ if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
+ continue;
+ }
+
// 鏄惁闇�瑕佸脊鍑烘
if (name.equals("璐︽埛绛夌骇鐗规潈")) {
if (uid != null) {
--
Gitblit v1.8.0