From 6eee4b9602f02664bfc4c55ae36583a1f419f73b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 五月 2019 15:38:59 +0800
Subject: [PATCH] 提现规则修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java |   59 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 30 insertions(+), 29 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 efdd79d..30ab9d2 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
@@ -38,6 +38,7 @@
 import com.yeshi.fanli.exception.goods.ShareGoodsTextTemplateException;
 import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
 import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;
@@ -226,7 +227,7 @@
 			BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(taoBaoLink.getGoods(), rate);
 			
 			data.put("shareMoney", "楼" + shareMoney.toString());
-			data.put("shareId", userShareGoodsRecordService.saveSingleShareRecord(uid, auctionId));
+//			data.put("shareId", userShareGoodsRecordService.saveSingleShareRecord(uid, auctionId));
 			out.print(JsonUtil.loadTrueResult(data));
 
 			// 寮傛鎿嶄綔
@@ -254,10 +255,13 @@
 				}
 			});
 			return;
-		} catch (UserShareGoodsRecordException e) {
-			out.print(JsonUtil.loadFalseResult(e.getMsg()));
-			e.printStackTrace();
-		} catch (ShareGoodsException e) {
+		}
+//		catch (UserShareGoodsRecordException e) {
+//			out.print(JsonUtil.loadFalseResult(e.getMsg()));
+//			e.printStackTrace();
+//		} 
+		
+		catch (ShareGoodsException e) {
 			try {
 				monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, e.getCode(), 0, "鍒嗕韩鍑洪敊"));
 			} catch (Exception e1) {
@@ -793,37 +797,22 @@
 					data.put("title", title);
 					
 				} else { // 鏈夊浘鍒嗕韩
-					
-					// 閭�璇烽摼鎺�
-					String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/" 
-							+ Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
-					data.put("inviteLink", shortLink);
-					data.put("inviteCode", inviteCode);
-					data.put("helpLink", configService.get("invite_help_link"));
-					
-					
-					// 閭�璇疯儗鏅浘鐗�
 					List<GoodsPicture> imgs = dynamicInfo.getImgs();
-					String bgUrl = imgs.get(0).getUrl();
+					String bgUrl = imgs.get(0).getUrlOriginal();
+					if (StringUtil.isNullOrEmpty(bgUrl)) {
+						out.print(JsonUtil.loadFalseResult("鍥剧墖璺緞涓嶅瓨鍦�"));
+						return;
+					}
+					
 					// 鐢ㄦ埛淇℃伅
 					UserInfo userInfo = userInfoService.selectByPKey(uid);
 					String portrait = userInfo.getPortrait();
 					// 鐢婚個璇峰浘鐗�
 					if (StringUtil.isNullOrEmpty(dynamicInfo.getInviteMaterialId())) {
-						String imgLink = spreadUserImgService.getInviteImg(bgUrl,uid, portrait, inviteCode);
+						String imgLink = spreadUserImgService.drawInviteQrCodeNew(bgUrl,uid, portrait, inviteCode);
 						data.put("imgLink", imgLink);
 					} else {
-						
-						String title ="";
-						List<ClientTextStyleVO> listTitle = dynamicInfo.getTitle();
-						if (listTitle != null && listTitle.size() > 0) {
-							for (ClientTextStyleVO textStyleVO : listTitle) {
-								title += textStyleVO.getContent();
-							}
-						}
-						title = title.replace("銆愰個璇风爜銆�", inviteCode);
-						title = title.replace("銆愰個璇烽摼鎺ャ��", UserUtil.getInviteShortLink(uid));
-						
+						String title = imgs.get(0).getTitleOriginal();
 						String imgLink = spreadUserImgService.getInviteImgToGreet(bgUrl,uid, portrait, inviteCode, title, new Date());
 						data.put("imgLink", imgLink);
 					}
@@ -838,6 +827,14 @@
 					String valueN = values.getValue();
 					String valueBr = valueN.replace("\n", "<br><br>");
 					data.put("inviteRules", valueBr);
+					
+					
+					// 閭�璇烽摼鎺�
+					String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/" 
+							+ Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);
+					data.put("inviteLink", shortLink);
+					data.put("inviteCode", inviteCode);
+					data.put("helpLink", configService.get("invite_help_link"));
 				}
 			}
 			out.print(JsonUtil.loadTrueResult(data));
@@ -854,7 +851,11 @@
 			
 		} catch (Exception e) {
 			out.print(JsonUtil.loadFalseResult("鍒嗕韩璁板綍澶辫触"));
-			e.printStackTrace();
+			try {
+				LogHelper.errorDetailInfo(e);
+			} catch (Exception e1) {
+				e1.printStackTrace();
+			}
 		}
 	}
 }

--
Gitblit v1.8.0