From 1215065e40d634a443cc13e54eefd2b10dcb3061 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 12:30:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
index 3ec1657..958dcd8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -30,6 +30,7 @@
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TLJFreeBuyGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
@@ -90,6 +91,10 @@
@Resource
private IntegralGetService integralGetService;
+
+ @Resource
+ private TLJFreeBuyGoodsService tljFreeBuyGoodsService;
+
private void doTaoLiJinBuy(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
JSONObject data = new JSONObject();
@@ -127,6 +132,7 @@
integralGetService.addTaoLiJinBuy(uid, auctionId);
}
+
/**
* 鑾峰彇娣樺疂鐨勫垎浜摼鎺�
@@ -183,7 +189,7 @@
doTaoLiJinBuy(acceptData, uid, auctionId, out);
return;
}
-
+
ClientTBPid clientTBPid = null;
String dpid = null;
@@ -239,16 +245,8 @@
// 鏄繑鍒╁晢鍝佸簱鐨勫晢鍝�
if (specialConvert) {
if (!StringUtil.isNullOrEmpty(specialId)) {
- if (source != null && "taolijin".equals(source)) {
- boolean isNewUser = userInfoExtraService.isNewUser(uid);
- if (isNewUser) {
- // 鍒ゅ畾涓鸿�佺敤鎴凤細
- // 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
- long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
- if (countRecord == 0) {
- taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId, null);
- }
- }
+ if (source != null && "taolijin_free_buy".equals(source)) {
+ taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId, null);
}
if (taoBaoLink == null) {
@@ -276,17 +274,9 @@
LogHelper.errorDetailInfo(e, "uid:" + uid, null);
}
if (!StringUtil.isNullOrEmpty(relationId)) {//
- if (source != null && "taolijin".equals(source)) {
- boolean isNewUser = userInfoExtraService.isNewUser(uid);
- if (isNewUser) {
- // 鍒ゅ畾涓鸿�佺敤鎴凤細
- // 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
- long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
- if (countRecord == 0) {
- taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId,
+ if (source != null && "taolijin_free_buy".equals(source)) {
+ taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId,
TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
- }
- }
} else {
taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId,
TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
@@ -316,6 +306,12 @@
// 鑾峰緱閲戝竵
integralGetService.addCouponRebate(uid);
+ } catch (ShareGoodsException e) {
+ if (e.getCode() == 1001) {
+ out.print(JsonUtil.loadFalseResult(1001, e.getMsg()));
+ } else {
+ out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
+ }
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
--
Gitblit v1.8.0