From 91ddd96c12ec25aaf6d0cb38d54288d863ab2b58 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 10 七月 2021 18:10:38 +0800
Subject: [PATCH] 礼金红包兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java
index c4ce535..2960770 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/lijin/GoodsControllerLijin.java
@@ -6,6 +6,7 @@
import com.ks.lijin.exception.LiJinGoodsException;
import com.ks.lijin.exception.LiJinUserException;
import com.ks.lijin.pojo.DO.LiJinExpendRecord;
+import com.ks.lijin.pojo.DTO.MoneyInfo;
import com.ks.vip.pojo.Enums.VIPEnum;
import com.yeshi.common.entity.taobao.TaoBaoShop;
import com.yeshi.common.entity.taobao.TaoKeAppInfo;
@@ -30,6 +31,7 @@
import com.yeshi.fanli.lijin.manager.UserLijinSendManager;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.pdd.PDDAuthService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
@@ -38,6 +40,7 @@
import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.util.*;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
+import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOLijinFactory;
import com.yeshi.fanli.util.factory.goods.ShopInfoVOFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
@@ -103,6 +106,9 @@
@Resource
private UserInfoService userInfoService;
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
+
/**
* 鑾峰彇鍟嗗搧璇︽儏
@@ -117,7 +123,9 @@
public void getGoodsDetail(AcceptData acceptData, int goodsType, String goodsId, Long uid, String from, PrintWriter out) {
GoodsDetailVO goodsDetailVO = new GoodsDetailVO();
GoodsDetailVO.GoodsExtraVO extraVO = new GoodsDetailVO.GoodsExtraVO();
- GoodsMoneyConfigParamsDTO paramsDTO = new GoodsMoneyConfigParamsDTO();
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion(), acceptData.getSystem());
+
paramsDTO.setFanLiRate(goodsLijinMnager.getFanLiRate(uid));
// 棰嗗埜浜哄垪琛�
List<ShamUser> listCouponUser = new ArrayList<>();
@@ -139,12 +147,15 @@
TaoBaoGoodsBrief goods = getTaoBaoGoods(Long.parseLong(goodsId));
+ //鍔犺浇璧勯噾淇℃伅
+ com.yeshi.fanli.vo.goods.GoodsDetailVO goodsDetailVO1 = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);
+ goodsDetailVO1 = goodsLijinMnager.loadTBMoneyInfo(acceptData.getSystem(), uid, goods, goodsDetailVO1);
goodsDetailVO.setGoods(GoodsDetailVOLijinFactory.convertTaoBao(goods, paramsDTO));
- BigDecimal lijinAmount = goodsLijinMnager.getTBLijin(uid, goods);
- if (lijinAmount != null && lijinAmount.compareTo(new BigDecimal(0)) > 0) {
- goodsDetailVO.getGoods().getMoneyInfo().setHongBaoMoney("楼" + lijinAmount);
- }
+ //閲嶇疆璧勯噾淇℃伅
+ goodsDetailVO.getGoods().setMoneyInfo(goodsDetailVO1.getMoneyInfo());
+
+
GoodsDetailVOLijinFactory.fillRights(goodsDetailVO.getGoods());
// 搴楅摵淇℃伅
@@ -317,6 +328,12 @@
data.put("link", link);
data.put("native", true);
data.put("userLevel", userLijinMnager.getUserLevelInfo(uid, acceptData.getSystem()));
+ //鑾峰彇浠婃棩鐨勫墿浣欐鏁�
+ try {
+ int leftCount = goodsLijinMnager.getTodayLeftCount(uid, new Date(user.getCreatetime()));
+ data.put("todayLeftCount", "绔嬪噺鏈轰細锛�-1娆� 浠婃棩鍓╀綑锛�" + leftCount + "娆�");
+ } catch (Exception e) {
+ }
out.print(JsonUtil.loadTrueResult(data));
} catch (LiJinException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
--
Gitblit v1.8.0