From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5SearchController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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..57915fb 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
@@ -247,19 +247,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));
--
Gitblit v1.8.0