From ecb361733a4f90ad1672c422577292a18c0fd2bb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 09:46:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java
index f9da302..986240d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java
@@ -5,17 +5,14 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -28,13 +25,16 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
+import com.yeshi.fanli.service.inter.config.CustomerContentService;
import com.yeshi.fanli.service.inter.config.SuperHotSearchService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.HistorySearchService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/h5/v1/webSearch")
@@ -54,6 +54,9 @@
@Resource
private SuperHotSearchService superHotSearchSerivce;
+
+ @Resource
+ private CustomerContentService customerContentService;
// 浼樻儬鍒�
/*
@@ -247,19 +250,19 @@
int fq = sf.getQuan();
int fh = sf.getHongbao();
boolean ft = sf.isTmall();
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
if (fq == 0 && fh == 0 && !ft) {
for (TaoBaoGoodsBrief bf : result.getTaoBaoGoodsBriefs()) {
- re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion, fcRate, ""));
+ re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(bf, proportion.toString(), ""));
}
} else {
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
- for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");
- re.add(taoBaoGoodsBriefExtra);
- }
+ if (taoBaoGoodsBriefs != null)
+ for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(),
+ "");
+ re.add(taoBaoGoodsBriefExtra);
+ }
}
Gson gson2 = JsonUtil.getApiCommonGson();
data.put("result", gson2.toJson(re));
@@ -276,7 +279,7 @@
@RequestMapping(value = "contactCustomer", method = RequestMethod.GET)
public void contactCustomerService(PrintWriter out) {
String title = "鑱旂郴瀹㈡湇";
- List<CustomerContent> contentList = systemClientParamsService.contactCustomerService(title);
+ List<CustomerContent> contentList = customerContentService.contactCustomerService(title);
JSONObject data = new JSONObject();
data.put("contentList", JsonUtil.getSimpleGsonWithDate().toJson(contentList));
out.print(JsonUtil.loadTrueResult(data));
@@ -298,7 +301,7 @@
* out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));
* return; }
*/
- List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4); // 杩斿埄鍒竌pp
+ List<SuperHotSearch> superHotSearchList = superHotSearchSerivce.getSuperHotSearchBySystemId(4, null); // 鏉挎牀蹇渷app
if (superHotSearchList == null || superHotSearchList.size() == 0) {
out.print(JsonUtil.loadFalseResult(H5ControllerUtil.NODATA));
return;
--
Gitblit v1.8.0