From 56e258fa6c23469ea825f6b11d458df9ba577e9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 14:38:50 +0800
Subject: [PATCH] Merge branch 'div'

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java |   58 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 39 insertions(+), 19 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 6ede170..be27d3b 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
@@ -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();
@@ -2052,16 +2064,20 @@
 		data.put("couponUsers", listCouponUser);
 		data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
 
-		JSONObject shareActivity = new JSONObject();
-		shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" + TaoBaoUtil.getGoodsHongBaoMoney(tb,
-				new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
-		shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");
-
-		if (!StringUtil.isNullOrEmpty(uid)
-				&& shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {
-		} else
-			data.put("shareActivity", shareActivity);
-
+		
+//		鍙栨秷鍒嗕韩娲诲姩
+//		if (!StringUtil.isNullOrEmpty(uid)
+//				&& shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {
+//		} else if(!"miandan".equals(from)) {
+//			// 闈炲厤鍗曞晢鍝�
+//			JSONObject shareActivity = new JSONObject();
+//			shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" + TaoBaoUtil.getGoodsHongBaoMoney(tb,
+//					new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
+//			shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");
+//			
+//			data.put("shareActivity", shareActivity);
+//		} 
+		
 		out.print(JsonUtil.loadTrueResult(data));
 
 		final String tempUid = uid;
@@ -2270,12 +2286,16 @@
 						}
 					}
 				}
+			} 
+			
+			if (listSpecial == null) {
+				listSpecial = new ArrayList<Special>();
 			}
 
 			JSONObject root = new JSONObject();
 			root.put("special", listSpecial);
-
 			out.print(JsonUtil.loadTrueResult(root));
+			
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

--
Gitblit v1.8.0