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/ConfigControllerV2.java | 78 +++++++++++++++++++++++++
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 11 ++-
fanli/src/main/java/com/yeshi/fanli/util/TaoBaoConstant.java | 4 +
fanli/src/main/resource/image/activityShare/qrcode_content_bg.png | 0
fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java | 4
fanli/src/main/resource/image/activityShare/icon_logo.png | 0
fanli/src/main/java/com/yeshi/fanli/util/RedisKeyEnum.java | 1
fanli/src/main/resource/image/elme_bg.png | 0
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | 2
fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopUtil.java | 41 +++++++++++++
10 files changed, 135 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
index 698a481..5bbbb1d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -545,7 +545,7 @@
HttpUtil.getAsInputStream(dto.getWx_qrcode_url()), 500, 500, 295, 908);
if (elmeShareImg != null) {
- String filePath = FilePathEnum.banLiShopClass.getPath() + "-" + uid + "-"
+ String filePath = FilePathEnum.elmeShare.getPath() + "-" + uid + "-"
+ UUID.randomUUID().toString().replace("-", "") + ".png";
FileUploadResult uploadResult = COSManager.getInstance().uploadFile(elmeShareImg, filePath);
if (uploadResult != null)
@@ -571,6 +571,82 @@
else
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
}
+
+
+ @RequestMapping(value = "getKouBeiLink")
+ public void getKouBeiLink(AcceptData acceptData, Long uid, String activityId, boolean share, boolean shareImg,
+ String callback, PrintWriter out) {
+
+ UserExtraTaoBaoInfo userInfoExtra = userExtraTaoBaoInfoService.getByUid(uid);
+ if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getRelationId())) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1001, "璇风粦瀹氭窐瀹�")));
+ return;
+ }
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.kouBeiLink, uid + "-" + activityId + "-" + share);
+ String elmeResult = redisManager.getCommonString(key);
+ JSONObject data = new JSONObject();
+ TaoKeOfficialActivityConvertResultDTO dto = null;
+ if (StringUtil.isNullOrEmpty(elmeResult)) {
+ if (share) {
+ dto = TaoKeApiUtil.officialActivityConvert(TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT.split("_")[3],
+ activityId, userInfoExtra.getRelationId());
+ } else {
+ dto = TaoKeApiUtil.officialActivityConvert(TaoBaoConstant.TAOBAO_KOUBEI_PID.split("_")[3], activityId,
+ userInfoExtra.getRelationId());
+ }
+
+ if (dto != null) {
+ if (share) {// 鐢熸垚鍙ｄ护
+ String token = TaoKeApiUtil.getTKToken("http://", "鍙ｇ",dto.getClick_url() );
+ dto.setToken(TaoBaoUtil.filterTaoToken(token));
+ }
+ redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(dto), 60 * 60);// 缂撳瓨1涓皬鏃�
+ }
+ } else {
+ dto = JsonUtil.getSimpleGson().fromJson(elmeResult, TaoKeOfficialActivityConvertResultDTO.class);
+
+ if (share && StringUtil.isNullOrEmpty(dto.getToken())) {
+ // 淇濆瓨鍙ｄ护
+ String token = TaoKeApiUtil.getTKToken("http://", "鍙ｇ", dto.getClick_url());
+ dto.setToken(TaoBaoUtil.filterTaoToken(token));
+ redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(dto), 60 * 60);// 缂撳瓨1涓皬鏃�
+ }
+
+ }
+
+ ElemeConvertInfoResultVO info = new ElemeConvertInfoResultVO(null, dto.getToken(), dto.getClick_url());
+ if (share && shareImg) {
+ InputStream elmeShareImg = ImageUtil.drawSimpleImage(
+ this.getClass().getClassLoader().getResourceAsStream("image/elme_bg.png"), 1080, 1646,
+ HttpUtil.getAsInputStream(dto.getWx_qrcode_url()), 500, 500, 295, 908);
+
+ if (elmeShareImg != null) {
+ String filePath = FilePathEnum.elmeShare.getPath() + "-" + uid + "-"
+ + UUID.randomUUID().toString().replace("-", "") + ".png";
+ FileUploadResult uploadResult = COSManager.getInstance().uploadFile(elmeShareImg, filePath);
+ if (uploadResult != null)
+ info.setQrCodeImg(uploadResult.getUrl());
+ }
+
+ if (info.getQrCodeImg() == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒嗕韩鍥剧敓鎴愬け璐�"));
+ return;
+ }
+
+ }
+
+ data.put("info", info);
+
+ ClientTBPid clientTBPid1 = new ClientTBPid(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ share ? TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT : TaoBaoConstant.TAOBAO_KOUBEI_PID, null,
+ TaoBaoConstant.TAOBAO_KOUBEI_PID.split("_")[3]);
+ clientTBPid1.setAdZoneId(clientTBPid1.getPid().split("_")[3]);
+ data.put("taoKeParams", clientTBPid1);
+ if (StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadTrueResult(data));
+ else
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ }
/**
* 鑾峰彇楗夸簡涔堢殑鎺ㄥ箍閾炬帴
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
index 3d456e3..78b09a1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java
@@ -1251,6 +1251,7 @@
if (!StringUtil.isNullOrEmpty(special.getPicture())) {
imgs.add(special.getPicture());
}
+ title=special.getName();
desc = special.getRemark();
startTime = special.getStartTime();
endTime = special.getEndTime();
@@ -1265,6 +1266,7 @@
if (!StringUtil.isNullOrEmpty(swiper.getSrc())) {
imgs.add(swiper.getSrc());
}
+ title=swiper.getTitle();
desc = swiper.getRemark();
startTime = swiper.getStartTime();
endTime = swiper.getEndTime();
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index f4e4a9c..916beef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -220,7 +220,8 @@
List<TaoBaoOrder> list = orders.get(orderId);
String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
- if ("楗夸簡涔�".equalsIgnoreCase(list.get(0).getOrderType())&&!pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT)) {
+ if ("楗夸簡涔�".equalsIgnoreCase(list.get(0).getOrderType())
+ && !pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT)) {
// 楗夸簡涔堣鍗曞紑濮嬪綊鍏ュ埌娣樺疂璁㈠崟
if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(),
"yyyy-MM-dd HH:mm:ss") >= Constant.NEW_ORDER_FANLI_RULE_TIME) {
@@ -228,6 +229,9 @@
} else {
elmeOrderMap.put(orderId, list);
}
+ } else if ("鍙ｇ".equalsIgnoreCase(list.get(0).getOrderType())
+ && pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_KOUBEI_PID)) {// 鍙ｇ鑷喘
+ fanliOrderMap.put(orderId, list);
} else {
if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())
|| pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)) {// 璁剧疆娓犻亾ID褰撳仛浼氬憳杩愯惀ID鐨勪綅缃甀D
@@ -740,8 +744,9 @@
&& !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 澶勭悊闈炶繑鍒╁晢鍝佸簱鐨勫晢鍝�
targetUid = taoBaoBuyRelationMapService.selectUidByRelationId(orderList.get(0).getRelationId());
- } else if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_ELEME_PID)
- && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 澶勭悊楗夸簡涔堢殑璁㈠崟
+ } else if ((pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_ELEME_PID)
+ || pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_KOUBEI_PID))
+ && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 澶勭悊楗夸簡涔�,鍙ｇ鐨勮鍗�
UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService
.getByRelationId(orderList.get(0).getRelationId());
if (extraInfo != null) {
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/RedisKeyEnum.java b/fanli/src/main/java/com/yeshi/fanli/util/RedisKeyEnum.java
index 31a5619..f5b0288 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/RedisKeyEnum.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/RedisKeyEnum.java
@@ -38,6 +38,7 @@
seacrhGoods("integral-seacrh-goods-", "鍟嗗搧鎼滅储"),
couponByClass("getCouponListByClass-", "閫氳繃鍒嗙被鑾峰彇鍒镐俊鎭�"),
elmeLink("elme-link-", "楗夸簡涔堥摼鎺�"),
+ kouBeiLink("koubei-link-", "鍙ｇ閾炬帴"),
recommendGoodsUser("recommend-goods-user-", "鐢ㄦ埛鎺ㄨ崘鍟嗗搧"),
S11YuShou("s11-yushou-", "鍙�11棰勫敭"),
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/TaoBaoConstant.java b/fanli/src/main/java/com/yeshi/fanli/util/TaoBaoConstant.java
index 71e57cb..fe18c80 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/TaoBaoConstant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/TaoBaoConstant.java
@@ -24,6 +24,10 @@
//楗夸簡涔圥ID
public static final String TAOBAO_ELEME_PID = "mm_124933865_56750082_109491050276";
+ //鍙ｇPID
+ public static final String TAOBAO_KOUBEI_PID = "mm_124933865_56750082_19511700026";
+
+
// 娣樼ぜ閲戜細鍛�
public static final String TAOBAO_TLJ_SPECIAL_PID_DEFAULT = "mm_124933865_56750082_19509300170";
public static BigDecimal OWN_BUY_WITHOUT_FANLI_RATE = new BigDecimal(70);// 鑷喘绔嬪噺鐨勬瘮渚�
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/vip/VipApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
similarity index 98%
rename from fanli/src/main/java/com/yeshi/fanli/util/vip/VipApiUtil.java
rename to fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
index 7d6ed49..62c956b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/vip/VipApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
@@ -1,4 +1,4 @@
-package com.yeshi.fanli.util.vip;
+package com.yeshi.fanli.util.vipshop;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -29,7 +29,7 @@
* @author Administrator
*
*/
-public class VipApiUtil {
+public class VipShopApiUtil {
private final static String appKey = "f9e7f22f";
private final static String appSecret = "9B2291352497FAF42B2DF44BFCF62316";
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopUtil.java
new file mode 100644
index 0000000..9713fa3
--- /dev/null
+++ b/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopUtil.java
@@ -0,0 +1,41 @@
+package com.yeshi.fanli.util.vipshop;
+
+public class VipShopUtil {
+
+ /**
+ * 鑾峰彇鍒嗕韩鐨勬笭閬撴爣璇�
+ * @Title: getShareChanTag
+ * @Description:
+ * @param uid
+ * @return
+ * String 杩斿洖绫诲瀷
+ * @throws
+ */
+ public static String getShareChanTag(Long uid) {
+ return "share#" + uid;
+ }
+
+ /**
+ * 鑾峰彇鑷喘鐨勬笭閬撴爣璇�
+ * @Title: getBuyChanTag
+ * @Description:
+ * @param uid
+ * @return
+ * String 杩斿洖绫诲瀷
+ * @throws
+ */
+ public static String getBuyChanTag(Long uid) {
+ return "buy#" + uid;
+
+ }
+
+ public static String getUidFromChanTag(String tag) {
+
+ return tag.split("#")[1];
+ }
+
+ public static String getTypeFromChanTag(String tag) {
+ return tag.split("#")[0];
+ }
+
+}
diff --git a/fanli/src/main/resource/image/activityShare/icon_logo.png b/fanli/src/main/resource/image/activityShare/icon_logo.png
new file mode 100644
index 0000000..951f53c
--- /dev/null
+++ b/fanli/src/main/resource/image/activityShare/icon_logo.png
Binary files differ
diff --git a/fanli/src/main/resource/image/activityShare/qrcode_content_bg.png b/fanli/src/main/resource/image/activityShare/qrcode_content_bg.png
new file mode 100644
index 0000000..cfa8316
--- /dev/null
+++ b/fanli/src/main/resource/image/activityShare/qrcode_content_bg.png
Binary files differ
diff --git a/fanli/src/main/resource/image/elme_bg.png b/fanli/src/main/resource/image/elme_bg.png
new file mode 100644
index 0000000..37a7ed4
--- /dev/null
+++ b/fanli/src/main/resource/image/elme_bg.png
Binary files differ
--
Gitblit v1.8.0