From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
index bffc94b..5deb4c2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCouponControllerV2.java
@@ -14,7 +14,6 @@
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
@@ -31,6 +30,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import com.yeshi.fanli.vo.user.UserSystemCouponVO;
import net.sf.json.JSONObject;
@@ -99,7 +99,7 @@
JSONObject data = new JSONObject();
if (page == 1) {
// 绂忓埄涓績鍥剧墖
- List<SwiperPicture> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top_1.6.5",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ List<BannerVO> listswiper = swiperPictureService.getByBannerCardAndVersion("welfare_top_1.6.5",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (listswiper != null && listswiper.size() > 0) {
String topPicture = listswiper.get(0).getSrc();
data.put("topPicture", topPicture);
@@ -116,9 +116,16 @@
data.put("count", count);
data.put("list", JsonUtil.getApiCommonGson().toJson(resultList));
out.print(JsonUtil.loadTrueResult(data));
-
- // 鏇存柊绂忓埄涓績鏈鏁伴噺
- if (page == 1) {
+ } catch (UserSystemCouponException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
+ LogHelper.errorDetailInfo(e);
+ }
+
+ // 鏇存柊绂忓埄涓績鏈鏁伴噺
+ if (page == 1) {
+ try {
executor.execute(new Runnable() {
@Override
public void run() {
@@ -132,12 +139,8 @@
}
}
});
+ } catch (Exception e) {
}
- } catch (UserSystemCouponException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
- LogHelper.errorDetailInfo(e);
}
}
--
Gitblit v1.8.0