From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@Admin> Date: 星期二, 18 十二月 2018 11:17:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 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 59e7ea4..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,9 +8,13 @@ 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; @@ -32,7 +36,6 @@ import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.config.SystemConfigService; import com.yeshi.fanli.service.inter.config.SystemService; -import com.yeshi.fanli.service.inter.goods.CollectionGoodsService; import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService; import com.yeshi.fanli.service.inter.goods.ShareGoodsService; import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService; @@ -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,10 +53,6 @@ import com.yeshi.fanli.util.Utils; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; -import org.yeshi.utils.JsonUtil; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; @Controller @RequestMapping("api/h5/v1/webRecommend") @@ -80,9 +80,6 @@ private SystemService systemService; @Resource - private CollectionGoodsService collectionGoodsService; - - @Resource private ConfigService configService; @Resource @@ -103,6 +100,9 @@ @Resource private TaoBaoUnionConfigService taoBaoUnionConfigService; + @Resource + private UserShareGoodsGroupService userShareGoodsGroupService; + /** * * 鏂规硶璇存槑: 鎺ㄨ崘杞挱鍟嗗搧淇℃伅 @@ -202,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++) { @@ -228,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); } @@ -285,6 +283,9 @@ } catch (Exception e) { } + + userShareGoodsGroupService.updateBrowseRecord(Long.parseLong(uid), Long.parseLong(id), 1); + } catch (Exception e) { -- Gitblit v1.8.0