From f0d98d82382d727d0f3c248eeb7c65a0a3824c20 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 15 六月 2020 15:00:29 +0800 Subject: [PATCH] 云发单 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java index c7f85a7..df75ec1 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java @@ -38,6 +38,7 @@ import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService; +import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService; import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.service.inter.user.cloud.UserCloudGoodsService; @@ -55,6 +56,7 @@ import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory; import com.yeshi.fanli.util.suning.SuningUtil; import com.yeshi.fanli.vo.goods.GoodsDetailVO; +import com.yeshi.fanli.vo.homemodule.BannerVO; import com.yeshi.fanli.vo.user.cloud.CloudOrderMenuVO; import com.yeshi.fanli.vo.user.cloud.UserCloudInfoVO; @@ -98,6 +100,8 @@ @Resource private RedisManager redisManager; + @Resource + private SwiperPictureService swiperPictureService; /** * 鏌ヨ寮�閫氳褰� @@ -237,6 +241,13 @@ } } } + + // 鏁欑▼ + List<BannerVO> listBanner = swiperPictureService.getByBannerCard("cloud_course"); + if (listBanner != null && listBanner.size() > 0) { + cloudInfoVO.setCourse(listBanner.get(0)); + } + JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(cloudInfoVO)); } @@ -569,7 +580,11 @@ commonGoods.setState(2); } } - + + if (state != null && state == UserCloudGoods.STATE_INVALID) { + commonGoods.setState(1); + } + GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO); detailVO.setId(commonGoods.getId()); -- Gitblit v1.8.0