From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 13 三月 2019 12:02:16 +0800 Subject: [PATCH] 正式数据库修改 --- fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java index fd8b2a7..051066c 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java @@ -22,10 +22,12 @@ import com.yeshi.fanli.entity.goods.CollectionGoodsV2; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra; +import com.yeshi.fanli.entity.taobao.TaoBaoHongBaoInfo; import com.yeshi.fanli.entity.taobao.TaobaoMeterial; import com.yeshi.fanli.exception.taobao.TaoKeApiException; import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException; import com.yeshi.fanli.log.LogHelper; +import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.config.SystemService; import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service; import com.yeshi.fanli.service.inter.goods.GoodsClassService; @@ -88,6 +90,10 @@ @Resource private HongBaoManageService hongBaoManageService; + + @Resource + private ConfigService configService; + /** * 9.9鍟嗗搧 @@ -1209,18 +1215,30 @@ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null); - // 灏嗗湪鍞环鏀逛负鍒稿悗浠� - extra.setZkPrice(extra.getQuanPrice()); + // 灏嗚繑鍒╂敼涓哄埜鍚庝环 + TaoBaoHongBaoInfo taoBaoHongBaoInfo = extra.getTaoBaoHongBaoInfo(); + if (taoBaoHongBaoInfo != null) { + taoBaoHongBaoInfo.setHongbao(extra.getQuanPrice()); + taoBaoHongBaoInfo.setRate("楼" + extra.getQuanPrice()); + } array.add(gson.toJson(extra)); } long count = qualityGoodsService.countFreeGoods(tkRate, lableName); + JSONObject data = new JSONObject(); + if (page == 1) { + // 鎶藉瑙勫垯 + String rules = configService.get("free_goods_rule"); + data.put("ruleLink", rules); + } + data.put("count", count); data.put("result_list", array); + JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); } catch (Exception e) { -- Gitblit v1.8.0