From c007868c62c7da5c9ce1bf0e77d9e5f8619826e4 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期三, 12 六月 2019 12:24:09 +0800 Subject: [PATCH] 查询默认有效调整 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java index 2d635e1..0c3f008 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java @@ -30,6 +30,7 @@ import com.yeshi.fanli.entity.system.BusinessSystem; import com.yeshi.fanli.entity.system.SystemClientParams; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; +import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra; import com.yeshi.fanli.entity.taobao.TaoBaoLink; import com.yeshi.fanli.entity.taobao.TaoKeAppInfo; import com.yeshi.fanli.exception.ShareGoodsException; @@ -266,6 +267,7 @@ }); return; } catch (ShareGoodsException e) { + LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:"+uid+"auctionId:"+auctionId, ""); // 鍒嗕韩鍑洪敊鎶ヨ try { monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, e.getCode(), 0, "鍒嗕韩鍑洪敊")); @@ -413,7 +415,7 @@ * @param out */ @RequestMapping(value = "updaterecord", method = RequestMethod.POST) - public void updateRecord(AcceptData acceptData, String shareId, PrintWriter out) { + public void updateRecord(AcceptData acceptData, String shareId, String type, PrintWriter out) { if (StringUtil.isNullOrEmpty(shareId)) { out.print(JsonUtil.loadFalseResult("鍙傛暟涓嶆纭�")); } @@ -680,6 +682,23 @@ long cid = dynamicInfo.getClassId(); if (cid == 1 || cid == 2) { // 1 鐑攢鍗曞搧 2 鎺ㄨ崘濂借揣 + if (cid == 1) { + List<GoodsPicture> imgs = dynamicInfo.getImgs(); + GoodsPicture goodsPicture = imgs.get(0); + if (goodsPicture.getGoodState() == 1) { + out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦")); + return; + } else { + TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods(); + try { + TaoKeApiUtil.getSimpleGoodsInfo(goods.getAuctionId()); + } catch (TaobaoGoodsDownException e) { + out.print(JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦")); + return; + } + } + } + // 鍒嗕韩鏂囧瓧 String title = null; List<ClientTextStyleVO> listTitle = dynamicInfo.getTitle(); @@ -688,6 +707,11 @@ for (ClientTextStyleVO textStyleVO : listTitle) { title += textStyleVO.getContent(); } + } + + + if(StringUtil.isNullOrEmpty(title)) { + title = "缁欎綘鎺ㄨ崘绮鹃�夊ソ鐗╀紭鎯犲埜锛岃喘鐗╁墠鍏堥鍒革紝鍒敊杩囦紭鎯犲摝~"; } data.put("title", title); data.put("content", "鎴戝湪杩斿埄鍒稿彂鐜颁簡涓�涓緢濂界殑鍟嗗搧锛屽揩鏉ョ湅鐪媬"); @@ -777,7 +801,10 @@ } else { // 鏈夊浘鍒嗕韩 List<GoodsPicture> imgs = dynamicInfo.getImgs(); - String bgUrl = imgs.get(0).getUrlOriginal(); + + GoodsPicture goodsPicture = imgs.get(0); + String bgUrl = goodsPicture.getUrlOriginal(); + if (StringUtil.isNullOrEmpty(bgUrl)) { out.print(JsonUtil.loadFalseResult("鍥剧墖璺緞涓嶅瓨鍦�")); return; @@ -787,8 +814,18 @@ UserInfo userInfo = userInfoService.selectByPKey(uid); String portrait = userInfo.getPortrait(); // 鐢婚個璇峰浘鐗� - if (StringUtil.isNullOrEmpty(dynamicInfo.getInviteMaterialId())) { - String imgLink = spreadUserImgService.drawInviteQrCodeNew(bgUrl, uid, portrait, inviteCode); + + Long activityId = dynamicInfo.getActivityId(); + if (activityId != null) { + Integer pX = goodsPicture.getPx(); + ; + Integer pY = goodsPicture.getPy(); + ; + Integer size = goodsPicture.getSize(); + + String imgLink = spreadUserImgService.drawInviteQrCodeNew(bgUrl, uid, portrait, pX, pY, size, + inviteCode); + data.put("imgLink", imgLink); } else { String title = imgs.get(0).getTitleOriginal(); -- Gitblit v1.8.0