From 9aa335f99a99c7e4b0e01b329bbd5d2c929fb3b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 18:24:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index bf1e1e8..27528a3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -238,7 +238,7 @@
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -1756,10 +1756,11 @@
* @param acceptData
* @param id
* @param uid
+ * @param pageSource 椤甸潰鏉ユ簮
* @param out
*/
@RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST)
- public void getGoodsInfo(AcceptData acceptData, String id, String uid, PrintWriter out) {
+ public void getGoodsInfo(AcceptData acceptData, String id, String uid, String from, PrintWriter out) {
if ("0".equalsIgnoreCase(uid)) {
uid = "";
@@ -1937,10 +1938,6 @@
goods.put("price", tb.getReservePrice().toString());
goods.put("zkPrice", tb.getZkPrice().toString());
- // 绾㈠寘
- BigDecimal proportion = manageService.getFanLiRate();
- String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
- goods.put("hongBao", hongBao);
// 30澶╅攢閲�
goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
@@ -1980,13 +1977,21 @@
// 棰嗗埜浜哄垪琛�
List<ShamUser> listCouponUser = new ArrayList<ShamUser>();
-
+
+ String hongBao = null;
+
// 鑾峰彇鍒镐俊鎭�
if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {
BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb);
JSONObject couponInfo = new JSONObject();
couponInfo.put("couponPrice", quanPrice.toString());
-
+
+ if (from != null && from.equals("miandan")) {
+ // 鍏嶅崟鍟嗗搧
+ hongBao = quanPrice.toString();
+ }
+
+
// 鏈嶅姟绔浆閾�
if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
couponInfo.put("couponUrl", tb.getCouponLink());
@@ -2005,7 +2010,14 @@
listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);
}
}
-
+
+ // 绾㈠寘
+ if (hongBao == null) {
+ BigDecimal proportion = manageService.getFanLiRate();
+ hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
+ }
+ goods.put("hongBao", hongBao);
+
data.put("tbPidInfo", clientTBPid);
String jumpUrl = "https://item.taobao.com/item.htm?id=" + tb.getAuctionId();
@@ -2220,9 +2232,8 @@
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
- * 娲诲姩鍒楄〃
+ * 娲诲姩鍒楄〃
*
* @param acceptData
* @param out
@@ -2235,13 +2246,13 @@
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
}
-
+
try {
// 涓撻娲诲姩
String specialCard = "special_activities";
-
- List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE,
- specialCard, system.getId());
+
+ List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
+ system.getId());
if (listSpecial != null && listSpecial.size() > 0) {
for (Special special : listSpecial) {
@@ -2251,13 +2262,12 @@
special.setRemark(null);
special.setCard(null);
special.setCardId(null);
-
+
JumpDetailV2 jumpDetail = special.getJumpDetail();
if (jumpDetail != null) {
jumpDetail.setId(null);
jumpDetail.setName(null);
}
-
// 閭�璇风櫥闄嗛獙璇�
if(jumpDetail.getType().equals("invite_web") && jumpDetail.getNeedLogin()
&& uid != null) {
--
Gitblit v1.8.0