From 2afe3a586ca9feb26f30e4d5af36941add5eca60 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 02 十二月 2019 17:30:30 +0800
Subject: [PATCH] 订单bug修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
index f1130f2..999bc6a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
@@ -38,6 +38,7 @@
import com.yeshi.fanli.entity.taobao.TLJFreeBuyGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.fanli.exception.user.UserInfoException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
@@ -772,17 +773,16 @@
* @param uid
* @param out
*/
- @RequestMapping(value = "gerFreeList", method = RequestMethod.POST)
- public void gerFreeList(AcceptData acceptData, int page, Long uid, PrintWriter out) {
+ @RequestMapping(value = "gerFreeList")
+ public void gerFreeList(String callback, AcceptData acceptData, int page, Long uid, PrintWriter out) {
if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
String day = TimeUtil.getGernalTime(java.lang.System.currentTimeMillis());
List<TLJFreeBuyGoods> listFree = tljFreeBuyGoodsService.listByDay(day);
if (listFree == null) {
- // TODO
listFree = new ArrayList<TLJFreeBuyGoods>();
}
@@ -819,11 +819,11 @@
data.put("count", array.size());
data.put("list", array);
if (page == 1) {
- List<SwiperPicture> bannerList = swiperPictureService.getByBannerCard("free_buy_banner");
- if (bannerList != null && bannerList.size() > 0) {
- data.put("topPicture", bannerList.get(0).getSrc());
- } else {
- data.put("topPicture", "");
+ try {
+ data.put("portrait", userInfoService.getUserInfo(uid).getPortrait());
+ } catch (UserInfoException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, e.getMsg()));
+ return;
}
String state = "宸茶繃鏈�";
@@ -844,8 +844,8 @@
data.put("state", state);
data.put("balance","鏂颁汉绾㈠寘锛�" + balance.setScale(2) + "鍏�");
- data.put("ruleUrl", configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule"));
+ data.put("rule", configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule"));
}
- out.print(JsonUtil.loadTrueResult(data));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
}
--
Gitblit v1.8.0