From 652de4214ebe5efcf3abd30e68c83cb38beb2a23 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 22 六月 2020 16:44:09 +0800
Subject: [PATCH] 云发单-发圈调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java
index b3b9e4f..ff7d7c9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java
@@ -15,7 +15,6 @@
import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.Special;
-import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.jd.JDGoodsException;
@@ -26,11 +25,12 @@
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.jd.JDGoodsService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
-import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -46,7 +46,7 @@
public class JingDongControllerV2 {
@Resource
- private HongBaoManageService hongBaoManageService;
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@@ -97,9 +97,9 @@
public void getGoodsInfo(AcceptData acceptData, Long cid, Integer page, PrintWriter out) {
JSONObject root = new JSONObject();
if (cid == 1 && page == 1) {
- List<SwiperPicture> topPicList = swiperPictureService.getByBannerCardAndVersion("jingdong_special_index",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ List<BannerVO> topPicList = swiperPictureService.getByBannerCardAndVersion("jingdong_special_index",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (topPicList == null) {
- topPicList = new ArrayList<SwiperPicture>();
+ topPicList = new ArrayList<BannerVO>();
}
root.put("listPic", JsonUtil.getApiCommonGson().toJson(topPicList));
@@ -116,7 +116,7 @@
List<JDGoods> goodsList = jdGoodsService.specialSearch(page, cid);
JSONArray array = new JSONArray();
if (goodsList != null && goodsList.size() > 0) {
- ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),
+ ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion());
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
--
Gitblit v1.8.0