From 2012b3b5db3c6b06535a68f775bcc81b16151b90 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 九月 2019 16:54:00 +0800
Subject: [PATCH] 加入任务
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 87 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 78 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index dc15224..c28d2b9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -3,6 +3,7 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -24,6 +25,7 @@
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;
+import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.BusinessSystem;
@@ -38,6 +40,7 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
@@ -45,6 +48,7 @@
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
@@ -60,6 +64,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyExtraService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -82,6 +87,7 @@
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.goods.MoneyInfoVO;
import com.yeshi.fanli.vo.goods.OtherInfo;
+import com.yeshi.fanli.vo.goods.RewardCouponVO;
import com.yeshi.fanli.vo.goods.ShareVO;
import com.yeshi.fanli.vo.goods.ShopInfoVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -168,6 +174,12 @@
@Resource
private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
/**
* 娣樺疂鍟嗗搧璇︽儏
@@ -412,7 +424,7 @@
// 鎺ㄥ箍绾㈠寘
if (from != null && from.equals("taolijin")) {
// 璁＄畻鎺ㄥ箍绾㈠寘
- String warningRate = configTaoLiJinService.getValueByKey("warning_value");
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value", new Date());
BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
@@ -421,8 +433,8 @@
return;
}
- // 鏄惁涓烘柊鐢ㄦ埛
- boolean isNewUser = userInfoExtraService.isNewUser(uid);
+ // 鍙栨秷鏂扮敤鎴疯嚜璐�
+ boolean isNewUser = false;// userInfoExtraService.isNewUser(uid);
if (isNewUser) {
// 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
@@ -466,6 +478,20 @@
otherInfo.setSpreadHongBao(spreadHongBao);
goodsDetail.setOtherInfo(otherInfo);
+ // 1.6.5鍚庢敼涓虹鍒╀环
+ if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (goodsDetail.getCouponPrice() != null
+ && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)
+ goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(spreadMoney));
+ else
+ goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(spreadMoney));
+ }
+
+ goodsDetail.getMoneyInfo().setFanliMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods,
+ hongBaoManageService.getTLJShareRate(System.currentTimeMillis())));
+ goodsDetail.getMoneyInfo().setShareMoney(TaoBaoUtil.getGoodsHongBaoInfo(goods,
+ hongBaoManageService.getTLJShareRate(System.currentTimeMillis())));
+
// 鐢ㄦ埛娣樼ぜ閲�
UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {
@@ -473,7 +499,7 @@
} else {
extraVO.setUserTLJ(userMoneyExtra.getTlj().setScale(2).toString());
}
- helpLink = configTaoLiJinService.getValueByKey("share_goods_help_link");
+ helpLink = configTaoLiJinService.getValueByKey("share_goods_help_link", new Date());
} else if (from != null && from.equals("taolijin_buy")) {
// 鏌ヨ鍒嗕韩搴�
@@ -489,17 +515,35 @@
shareValid = false;
helpLink = configService.get("zigoulijian_nofanli_help");
- String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();
+ BigDecimal tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
ReduceHongBao reduceHongBao = new ReduceHongBao();
reduceHongBao.setLeft(buyGoods.getLeftHongBaoCount());
- reduceHongBao.setMoney(tljHongBao);
+ reduceHongBao.setMoney(tljHongBao.toString());
reduceHongBao.setName("浠樻绔嬪噺 ");
reduceHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
reduceHongBao.setTotal(buyGoods.getTotalHongBaoCount());
OtherInfo otherInfo = new OtherInfo();
otherInfo.setReduceHongBao(reduceHongBao);
+ goodsDetail.setOtherInfo(otherInfo);
+
+ // 1.6.5鍚庢敼涓虹鍒╀环
+ if (com.yeshi.fanli.util.VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (goodsDetail.getCouponPrice() != null
+ && goodsDetail.getCouponPrice().compareTo(new BigDecimal(0)) > 0)
+ goodsDetail.setCouponPrice(goodsDetail.getCouponPrice().subtract(tljHongBao));
+ else
+ goodsDetail.setZkPrice(goodsDetail.getZkPrice().subtract(tljHongBao));
+ }
+ } else {// 鏅�氳喘涔�
+ OtherInfo otherInfo = new OtherInfo();
+ RewardCouponVO rewardCoupon = new RewardCouponVO();
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
+ rewardCoupon.setMaxMoney("楼" + MoneyBigDecimalUtil.mul(TaoBaoUtil.getGoodsHongBaoMoney(goods, fanLiRate),
+ Constant.MAX_REWARD_RATE));
+ rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
+ otherInfo.setRewardCoupon(rewardCoupon);
goodsDetail.setOtherInfo(otherInfo);
}
extraVO.setFanliValid(fanliValid);
@@ -580,6 +624,16 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertJDGoods(jdGoods, fanLiRate, shareRate);
+
+ // 闄勫姞淇℃伅
+ OtherInfo otherInfo = new OtherInfo();
+ RewardCouponVO rewardCoupon = new RewardCouponVO();
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
+ rewardCoupon.setMaxMoney(
+ "楼" + MoneyBigDecimalUtil.mul(JDUtil.getGoodsFanLiMoney(jdGoods, fanLiRate), Constant.MAX_REWARD_RATE));
+ rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
+ otherInfo.setRewardCoupon(rewardCoupon);
+ goodsDetail.setOtherInfo(otherInfo);
CouponInfoVO couponInfo = goodsDetail.getCouponInfo();
if (couponInfo != null) {
@@ -715,6 +769,17 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertPDDGoods(pddGoods, fanLiRate, shareRate);
+
+ // 闄勫姞淇℃伅
+ OtherInfo otherInfo = new OtherInfo();
+ RewardCouponVO rewardCoupon = new RewardCouponVO();
+ rewardCoupon.setJumpDetail(jumpDetailV2Service.getByTypeCache("integralExchange"));
+ rewardCoupon.setMaxMoney("楼" + MoneyBigDecimalUtil.mul(PinDuoDuoUtil.getGoodsFanLiMoney(pddGoods, fanLiRate),
+ Constant.MAX_REWARD_RATE));
+ rewardCoupon.setDesc("鐢ㄨ繑鍒╁鍔卞埜鏈�楂樿繑");
+ otherInfo.setRewardCoupon(rewardCoupon);
+ goodsDetail.setOtherInfo(otherInfo);
+
CouponInfoVO couponInfo = goodsDetail.getCouponInfo();
PDDPromotionUrl convertUrl = null;
if (couponInfo != null) {
@@ -808,7 +873,7 @@
extraVO.setShare(shareInfoVO);
if (convertUrl != null) {
- extraVO.setCouponJumpLink(convertUrl.getShortUrl());
+ extraVO.setCouponJumpLink(convertUrl.getUrl());
extraVO.setNativeCouponJumpLink(PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));
}
@@ -937,9 +1002,7 @@
try {
goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);
} catch (TaoKeApiException e1) {
- e1.printStackTrace();
} catch (TaobaoGoodsDownException e1) {
- e1.printStackTrace();
}
if (goodsList != null && goodsList.size() > 0) {
@@ -1042,6 +1105,9 @@
data.put("native", true);
data.put("jumpLink", jumpLink);
out.print(JsonUtil.loadTrueResult(data));
+
+ // 鑾峰緱閲戝竵
+ integralGetService.addCouponRebate(uid);
}
/**
@@ -1084,6 +1150,9 @@
data.put("jumpLink", convertUrl.getUrl());
data.put("nativeJumpLink", PinDuoDuoUtil.getAndroidNativeURI(convertUrl.getUrl()));
out.print(JsonUtil.loadTrueResult(data));
+
+ // 鑾峰緱閲戝竵
+ integralGetService.addCouponRebate(uid);
}
/**
--
Gitblit v1.8.0