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/apph5/AppH5PushController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java
index 6904f80..0b274b9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5PushController.java
@@ -1,14 +1,12 @@
package com.yeshi.fanli.controller.apph5;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
@@ -19,12 +17,12 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
import com.yeshi.fanli.entity.push.PushGoodsRecord;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.goods.CommonGoods;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
@@ -32,6 +30,9 @@
import com.yeshi.fanli.service.inter.push.PushGoodsService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
/**
* 浠婃棩鎺ㄩ��
@@ -60,6 +61,9 @@
@Resource
private PushGoodsRecordService pushGoodsRecordService;
+
+ @Resource
+ private HongBaoManageService hongBaoManageService;
/**
* 鎺ㄩ�佸晢鍝佽鎯呴〉
@@ -92,8 +96,7 @@
if (list != null && list.size() > 0) {
Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
for (PushGoodsGroup pushGoodsGroup : list) {
CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();
@@ -117,7 +120,7 @@
commonGoods.setPicture(TbImgUtil.getTBSize320Img(pictUrl));
}
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, fcRate, null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null)));
}
}
--
Gitblit v1.8.0