| fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fanli/src/main/java/com/yeshi/fanli/util/RedisKeyEnum.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fanli/src/main/java/com/yeshi/fanli/util/TaoBaoConstant.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fanli/src/main/resource/image/activityShare/icon_logo.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fanli/src/main/resource/image/activityShare/qrcode_content_bg.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fanli/src/main/resource/image/elme_bg.png | 补丁 | 查看 | 原始文档 | blame | 历史 |
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))); } /** * 获取饿了么的推广链接 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(); 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的位置ID @@ -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) { 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预售"), fanli/src/main/java/com/yeshi/fanli/util/TaoBaoConstant.java
@@ -24,6 +24,10 @@ //饿了么PID 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);// 自购立减的比例 fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/vip/VipApiUtil.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"; fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopUtil.java
New file @@ -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]; } } fanli/src/main/resource/image/activityShare/icon_logo.png
