From e04f81915e100107eca5fe16ba44898f3a0dbd55 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 04 七月 2020 18:48:06 +0800 Subject: [PATCH] redis指定数据库 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 137 ++++++++++++++++++++++++++------------------- 1 files changed, 78 insertions(+), 59 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 8919cf3..0128ca1 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 @@ -1,6 +1,7 @@ package com.yeshi.fanli.controller.client.v1; import java.io.PrintWriter; +import java.lang.reflect.Type; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; @@ -9,6 +10,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import com.yeshi.fanli.entity.SystemEnum; +import com.yeshi.fanli.exception.taobao.TaoBaoConvertLinkException; +import com.yeshi.fanli.service.manger.goods.TaoBaoLinkManager; import org.springframework.core.task.TaskExecutor; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,8 +21,12 @@ import org.yeshi.utils.JsonUtil; import org.yeshi.utils.taobao.TbImgUtil; -import com.fasterxml.jackson.core.util.VersionUtil; +import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; import com.yeshi.fanli.controller.client.v2.ShareControllerV2; import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO; import com.yeshi.fanli.entity.accept.AcceptData; @@ -28,10 +36,10 @@ import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinRecord; import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo; import com.yeshi.fanli.entity.bus.user.UserInfo; -import com.yeshi.fanli.entity.bus.user.UserInfoExtra; import com.yeshi.fanli.entity.dynamic.DynamicInfo; import com.yeshi.fanli.entity.dynamic.GoodsPicture; import com.yeshi.fanli.entity.system.BusinessSystem; +import com.yeshi.fanli.entity.system.ConfigKeyEnum; import com.yeshi.fanli.entity.system.SystemClientParams; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra; @@ -66,7 +74,6 @@ import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TaoBaoConstant; -import com.yeshi.fanli.util.account.UserUtil; import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil; import com.yeshi.fanli.util.factory.MonitorFactory; import com.yeshi.fanli.util.taobao.TaoBaoUtil; @@ -86,6 +93,9 @@ @Resource private ShareGoodsService shareGoodsService; + + @Resource + private TaoBaoLinkManager taoBaoLinkManager; @Resource private ConfigService configService; @@ -189,15 +199,15 @@ } if (source != null && "taolijin".equals(source)) { - createTaoLijin(uid, auctionId, totalNum, relationId, request, out); + createTaoLijin(uid, auctionId, totalNum, relationId,acceptData.getSystem(), request, out); return; } try { - TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId); + TaoBaoLink taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(uid, auctionId, relationId,null); JSONObject data = new JSONObject(); - String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(), + String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(acceptData.getSystem()), Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), auctionId + ""); @@ -208,7 +218,7 @@ data.put("clickUrl", url); data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); - data.put("rule", configService.get("share_single_goods_rule")); + data.put("rule", configService.getValue(ConfigKeyEnum.shareSingleGoodsRule.getKey(),acceptData.getSystem())); data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500)); String shareText = ""; @@ -219,14 +229,14 @@ if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) { String text = shareGoodsTextTemplateService.getCommonTemplate(uid); if (StringUtil.isNullOrEmpty(text)) - text = configService.get("goods_share_text_nocoupon"); + text = configService.getValue(ConfigKeyEnum.goodsShareTextNoCoupon.getKey(),acceptData.getSystem()); shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle()).replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + ""); } else// 鏈夊埜 { String text = shareGoodsTextTemplateService.geteCouponTemplate(uid); if (StringUtil.isNullOrEmpty(text)) - text = configService.get("goods_share_text_coupon"); + text = configService.getValue(ConfigKeyEnum.goodsShareTextCoupon.getKey(),acceptData.getSystem()); shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle()) .replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "") @@ -244,12 +254,12 @@ descText = descText.substring(0); data.put("descText", descText); // - String imgs = configService.get("goods_share_notify_imgs"); + String imgs = configService.getValue(ConfigKeyEnum.goodsShareNotifyImgs.getKey(),acceptData.getSystem()); JSONArray array = JSONArray.fromObject(imgs); int p = (int) (array.size() * Math.random()); if (p < array.size()) data.put("notifyPicture", array.optString(p)); - data.put("notifyDesc", configService.get("goods_share_notify")); + data.put("notifyDesc", configService.getValue(ConfigKeyEnum.goodsShareNotify.getKey(),acceptData.getSystem())); // 娣诲姞鍒嗕韩璁板綍 BigDecimal rate = hongBaoManageService.getShareRate(); @@ -295,7 +305,7 @@ } }); return; - } catch (ShareGoodsException e) { + } catch (TaoBaoConvertLinkException e) { LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:" + uid + "auctionId:" + auctionId, ""); // 鍒嗕韩鍑洪敊鎶ヨ try { @@ -303,7 +313,7 @@ } catch (Exception e1) { } out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage())); - businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + "")); + businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + ""),acceptData.getSystem()); } } @@ -317,10 +327,10 @@ * @param request * @param out */ - public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, HttpServletRequest request, - PrintWriter out) { + public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, SystemEnum system, HttpServletRequest request, + PrintWriter out) { try { - TaoBaoLink taoBaoLink = shareGoodsService.getTaoLiJinLinkForShare(uid, auctionId, relationId); + TaoBaoLink taoBaoLink = taoBaoLinkManager.getTaoLiJinLinkForShare(uid, auctionId, relationId,null); TaoBaoGoodsBrief goods = taoBaoLink.getGoods(); @@ -350,7 +360,7 @@ return; } - String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&tid=%s", configService.getH5Host(), + String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&tid=%s", configService.getH5Host(system), Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), auctionId + "", AESUtil.encrypt(tljId + "", Constant.UIDAESKEY)); String shortLink = HttpUtil.getShortLink(url); @@ -375,7 +385,7 @@ data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); data.put("rule", - "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0"); + "http://apph5.banliapp.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0"); data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500)); // 鏃犲埜 @@ -386,7 +396,7 @@ if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) { String text = shareGoodsTextTemplateService.getCommonTemplate(uid); if (StringUtil.isNullOrEmpty(text)) - text = configService.get("goods_share_text_nocoupon"); + text = configService.getValue(ConfigKeyEnum.goodsShareTextNoCoupon.getKey(),system); shareText = text.replace("{鏍囬}", taoBaoLink.getGoods().getTitle()).replace("{鍟嗗搧鍘熶环}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + ""); } else// 鏈夊埜 @@ -412,12 +422,12 @@ descText = descText.substring(0); data.put("descText", descText); - String imgs = configService.get("goods_share_notify_imgs"); + String imgs = configService.getValue(ConfigKeyEnum.goodsShareNotifyImgs.getKey(),system); JSONArray array = JSONArray.fromObject(imgs); int p = (int) (array.size() * Math.random()); if (p < array.size()) data.put("notifyPicture", array.optString(p)); - data.put("notifyDesc", configService.get("goods_share_notify")); + data.put("notifyDesc", configService.getValue(ConfigKeyEnum.goodsShareNotify.getKey(),system)); // 娣诲姞鍒嗕韩璁板綍 BigDecimal rate = hongBaoManageService.getShareRate(); @@ -463,7 +473,7 @@ } }); return; - } catch (ShareGoodsException e) { + } catch (TaoBaoConvertLinkException e) { LogHelper.errorDetailInfo(e, "鍒嗕韩鍑洪敊:uid:" + uid + "auctionId:" + auctionId, ""); // 鍒嗕韩鍑洪敊鎶ヨ try { @@ -471,7 +481,7 @@ } catch (Exception e1) { } out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage())); - businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + "")); + businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + ""),system); } } @@ -507,16 +517,28 @@ List<UserShareGoodsRecord> list = new ArrayList<UserShareGoodsRecord>(); long count = userShareGoodsRecordService.countQueryByUid(uid, source); - if (count > 0) { list = userShareGoodsRecordService.getMyShareGoodsRecords((page - 1) * pageSize, pageSize, uid, source); } - data.put("count", count); - data.put("result_list", - JsonUtil.getConvertBigDecimalToStringBuilder(new GsonBuilder()).create().toJson(list)); - out.print(JsonUtil.loadTrueResult(data)); + GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation(); + gsonBuilder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() { + @Override + public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) { + if (value == null) { + return new JsonPrimitive(""); + } else { + // 淇濈暀2浣嶅皬鏁� + value = value.setScale(2); + return new JsonPrimitive(value.toString()); + } + } + }); + Gson gson = gsonBuilder.create(); + data.put("count", count); + data.put("result_list", gson.toJson(list)); + out.print(JsonUtil.loadTrueResult(data)); } catch (Exception e) { out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触")); e.printStackTrace(); @@ -675,7 +697,7 @@ } if (StringUtil.isNullOrEmpty(template)) - template = getShareTemplate(uid, hasCoupon, tljId); + template = getShareTemplate(uid, hasCoupon, tljId,acceptData.getSystem()); // 鏍¢獙鍒告ā鏉挎槸鍚︽纭� if (hasCoupon) { @@ -714,7 +736,7 @@ } url = userTaoLiJinRecord.getSendUrl(); } else { - url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(), + url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(acceptData.getSystem()), Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), goods.getAuctionId() + ""); } @@ -834,7 +856,7 @@ out.print(JsonUtil.loadTrueResult("")); } - private String getShareTemplate(Long uid, boolean hasCoupon, Long tljId) { + private String getShareTemplate(Long uid, boolean hasCoupon, Long tljId,SystemEnum system) { if (hasCoupon) { if (tljId != null) { String template = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid); @@ -844,14 +866,14 @@ } else { String template = shareGoodsTextTemplateService.geteCouponTemplate(uid); if (StringUtil.isNullOrEmpty(template)) - template = configService.get("goods_share_text_coupon"); + template = configService.getValue(ConfigKeyEnum.goodsShareTextCoupon.getKey(),system); return template; } } else { String template = shareGoodsTextTemplateService.getCommonTemplate(uid); if (StringUtil.isNullOrEmpty(template)) - template = configService.get("goods_share_text_nocoupon"); + template = configService.getValue(ConfigKeyEnum.goodsShareTextNoCoupon.getKey(),system); return template; } } @@ -877,7 +899,7 @@ } JSONObject data = new JSONObject(); - data.put("template", getShareTemplate(uid, hasCoupon, tljId)); + data.put("template", getShareTemplate(uid, hasCoupon, tljId,acceptData.getSystem())); out.print(JsonUtil.loadTrueResult(data)); } @@ -892,7 +914,7 @@ if (tljId != null) { out.print(JsonUtil.loadTrueResult(configTaoLiJinService.getValueByKey("share_goods_rules", new Date()))); } else { - out.print(JsonUtil.loadTrueResult(configService.get("share_goods_template_rules"))); + out.print(JsonUtil.loadTrueResult(configService.getValue(ConfigKeyEnum.shareGoodsTemplateRules.getKey(),acceptData.getSystem()))); } } @@ -900,8 +922,8 @@ * 鏌ヨ椤堕儴鍒嗙被 * * @param acceptData - * @param page - * @param cid + * @param id + * @param uid * @param out */ @RequestMapping(value = "shareDynamic", method = RequestMethod.POST) @@ -1026,10 +1048,10 @@ data.put("shareMoney", new BigDecimal(content.substring(index + 1, content.length())).toString()); // 鍒嗕韩鎻愰啋 - data.put("notifyDesc", configService.get("goods_share_notify")); + data.put("notifyDesc", configService.getValue(ConfigKeyEnum.goodsShareNotify.getKey(),acceptData.getSystem())); // 鍒嗕韩鎻愮ず璇� - String imgs = configService.get("goods_share_notify_imgs"); + String imgs = configService.getValue(ConfigKeyEnum.goodsShareNotifyImgs.getKey(),acceptData.getSystem()); JSONArray array = JSONArray.fromObject(imgs); int p = (int) (array.size() * Math.random()); if (p < array.size()) { @@ -1042,7 +1064,7 @@ // 甯姪閾炬帴 data.put("helpLink", - "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0"); + "http://apph5.banliapp.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0"); if (cid == 2) { // 2 鎺ㄨ崘濂借揣 ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordDynamic(uid, @@ -1057,7 +1079,7 @@ Long auctionId = dynamicInfo.getImgs().get(0).getGoods().getAuctionId(); // 鍟嗗搧鍒嗕韩閾炬帴 - String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(), + String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(acceptData.getSystem()), Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), auctionId + ""); String shortLink = HttpUtil.getShortLink(url); @@ -1074,21 +1096,21 @@ && extraInfo.getRelationValid() == true) { relationId = extraInfo.getRelationId(); } - TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId); + TaoBaoLink taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(uid, auctionId, relationId,null); TaoBaoGoodsBrief goods = taoBaoLink.getGoods(); if (!com.yeshi.fanli.util.VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) - data.put("clickUrl", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken())); + data.put("clickUrl", + ShareControllerV2.getERCodeContentNew( + configService.getValue(ConfigKeyEnum.taobaoShareQrcodeText.getKey(),acceptData.getSystem()), goods, + taoBaoLink.getTaoToken())); data.put("token", TaoBaoUtil.filterTaoToken(taoBaoLink.getTaoToken())); - String inviteCode = null; - UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid); - if (extra != null) - inviteCode = extra.getInviteCode(); + String inviteCode = userInfoExtraService.getInviteCodeByUid(uid); // 娴嬭瘯 List<String> commentTexts = new ArrayList<>(); - String commentTextStr = configService.get("share_single_goods_comment_text"); + String commentTextStr = configService.getValue(ConfigKeyEnum.shareSingleGoodsCommentText.getKey(),acceptData.getSystem()); if (!StringUtil.isNullOrEmpty(commentTextStr)) { JSONArray arr = JSONArray.fromObject(commentTextStr); for (int i = 0; i < arr.size(); i++) { @@ -1106,16 +1128,16 @@ } } data.put("commentTexts", commentTexts); - data.put("wxErCode", ShareControllerV2.getERCodeContent(goods, taoBaoLink.getTaoToken())); + data.put("wxErCode", + ShareControllerV2.getERCodeContentNew( + configService.getValue(ConfigKeyEnum.taobaoShareQrcodeText.getKey(),acceptData.getSystem()), goods, + taoBaoLink.getTaoToken())); } } else if (cid == 4) { // 閭�璇峰垎浜� - String inviteCode = null; - UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); - if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) { - inviteCode = userInfoExtra.getInviteCode(); - } else { + String inviteCode = userInfoExtraService.getInviteCodeByUid(uid); + if (StringUtil.isNullOrEmpty(inviteCode)) { out.print(JsonUtil.loadFalseResult(9001, "閭�璇风爜鏈縺娲�")); return; } @@ -1181,12 +1203,9 @@ 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("inviteLink", Constant.YINGYONGBAO_LINK); data.put("inviteCode", inviteCode); - data.put("helpLink", configService.get("invite_help_link")); + data.put("helpLink", configService.getValue(ConfigKeyEnum.inviteHelpLink.getKey(),acceptData.getSystem())); } } out.print(JsonUtil.loadTrueResult(data)); -- Gitblit v1.8.0