From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
index 3fd8bf6..11c21a9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
@@ -12,6 +12,12 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.yeshi.utils.HttpUtil;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.QRCodeUtil;
+import org.yeshi.utils.entity.FileUploadResult;
+import org.yeshi.utils.exception.HttpException;
+import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
@@ -26,27 +32,27 @@
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.ShareGoodsException;
+import com.yeshi.fanli.exception.goods.CommonGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
+import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.ImageUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import org.yeshi.utils.HttpUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.QRCodeUtil;
-import org.yeshi.utils.entity.FileUploadResult;
-import org.yeshi.utils.exception.HttpException;
-import org.yeshi.utils.tencentcloud.COSManager;
@Service
public class ShareGoodsServiceImpl implements ShareGoodsService {
@@ -78,6 +84,15 @@
@Resource
private UserAccountService userAccountService;
+ @Resource
+ private HongBaoManageService hongBaoManageService;
+
+ @Resource
+ private UserShareGoodsRecordService userShareGoodsRecordService;
+
+ @Resource
+ private CommonGoodsService commonGoodsService;
+
@Override
public void addShareGoodsHistory(UserShareGoodsHistory history) {
UserShareGoodsHistory userShareGoodsHistory = userShareGoodsHistoryMapper
@@ -89,6 +104,7 @@
userShareGoodsHistoryMapper.updateByPrimaryKeySelective(userShareGoodsHistory);
} else
userShareGoodsHistoryMapper.insertSelective(history);
+
}
@Override
@@ -136,7 +152,8 @@
if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && StringUtil.isNullOrEmpty(goods.getAuctionUrl())) {
throw new ShareGoodsException(10, "杞摼澶辫触");
}
- BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue());
+
+ BigDecimal rate = hongBaoManageService.getShareRate();
// 鍒涘缓娣樺彛浠�
TaoBaoLink tbLink = new TaoBaoLink(); // TaoBaoUtil.getTbLinkForShare(goods.getAuctionId(),
@@ -380,6 +397,8 @@
goods.setAuctionUrl(taoBaoLink.getClickUrl());
}
+ // 淇濆瓨鍟嗗搧璇︽儏
+
// 鍒涘缓娣樺彛浠�
TaoBaoLink tbLink = new TaoBaoLink();
tbLink.setAuctionId(goods.getAuctionId());
@@ -400,6 +419,10 @@
tbLink.setGoods(goods);
+ // 瀛樺偍鍒嗕韩鍟嗗搧鐨勪俊鎭紝鐢ㄤ簬鍔犲揩鍒嗕韩缃戦〉鎺ュ彛璇锋眰閫熷害
+ if (Constant.IS_OUTNET)
+ redisManager.saveTaoBaoGoodsBriefTemp(goods);
+
return tbLink;
}
--
Gitblit v1.8.0