From b99a10cff6b4c4d0965871be894fba8ba64605fc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 14:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
index e7f7936..bd5e44e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
@@ -53,7 +53,6 @@
import com.yeshi.fanli.util.ImageUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -917,16 +916,14 @@
// 娓呯悊缂撳瓨
redisManager.removeCommonString(shareKey);
- if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
- if (singleGoods) {
- if (taolijin) {
- integralGetService.addShareTLJGoods(uid);
- } else {
- integralGetService.addShareSingleGoods(uid);
- }
+ if (singleGoods) {
+ if (taolijin) {
+ integralGetService.addShareTLJGoods(uid);
} else {
- integralGetService.addShareMultipleGoods(uid);
+ integralGetService.addShareSingleGoods(uid);
}
+ } else {
+ integralGetService.addShareMultipleGoods(uid);
}
}
--
Gitblit v1.8.0