From 42b206d89cf0a6f4c2bb2567d867d7c479d6edf1 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 12 一月 2019 15:30:06 +0800
Subject: [PATCH] 后台订单、用户信息调整
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
index 7152196..4cf9449 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
@@ -8,6 +8,9 @@
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;
@@ -42,6 +45,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.ScanHistoryService;
import com.yeshi.fanli.service.inter.user.TBPidService;
+import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -49,9 +53,6 @@
import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/h5/v1/webRecommend")
@@ -99,6 +100,9 @@
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
+ @Resource
+ private UserShareGoodsGroupService userShareGoodsGroupService;
+
/**
*
* 鏂规硶璇存槑: 鎺ㄨ崘杞挱鍟嗗搧淇℃伅
@@ -198,9 +202,7 @@
JSONObject validData = null;
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- Map<String, String> convertMap = hongBaoManageService.convertMap();
- String proportion = convertMap.get("hongbao_goods_proportion");
- String fcRate = convertMap.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();
for (int i = 0; i < size; i++) {
@@ -224,7 +226,7 @@
JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));
String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(
gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),
- proportion, fcRate, ""));
+ proportion.toString(), ""));
obj.put("taoBaoGoodsBrief", json);
array.add(obj);
}
@@ -281,6 +283,9 @@
} catch (Exception e) {
}
+
+ userShareGoodsGroupService.updateBrowseRecord(Long.parseLong(uid), Long.parseLong(id), 1);
+
} catch (Exception e) {
--
Gitblit v1.8.0