fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -30,6 +30,7 @@ import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.ThreadUtil; import com.yeshi.fanli.util.VersionUtil; import net.sf.json.JSONObject; @@ -97,17 +98,19 @@ FloatAD floatAD = null; if (uid == null) { DeviceTaoLiJinRecord deviceRecord = deviceTaoLiJinRecordService.getByDevice(acceptData.getDevice()); if (deviceRecord == null) { floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1); if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) { if (uid == null) { DeviceTaoLiJinRecord deviceRecord = deviceTaoLiJinRecordService.getByDevice(acceptData.getDevice()); if (deviceRecord == null) { floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1); } } else { UserTaoLiJinOrigin userTaoLiJin = uerTaoLiJinOriginService.getByUidAndOrigin(uid, TaoLiJinOriginEnum.newbiesWin.name()); if (userTaoLiJin == null) { floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1); } } } else { UserTaoLiJinOrigin userTaoLiJin = uerTaoLiJinOriginService.getByUidAndOrigin(uid, TaoLiJinOriginEnum.newbiesWin.name()); if (userTaoLiJin == null) { floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1); } } } // 无新人弹框 则查询默认 if (floatAD == null) { fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -27,8 +27,10 @@ import com.yeshi.fanli.service.inter.monitor.MonitorService; import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService; import com.yeshi.fanli.service.inter.user.TBPidService; import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService; import com.yeshi.fanli.service.inter.user.UserInfoExtraService; import com.yeshi.fanli.service.inter.user.UserInfoService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.StringUtil; @@ -68,7 +70,14 @@ @Resource private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService; @Resource private UserInfoExtraService userInfoExtraService; @Resource private UserTaoLiJinRecordService userTaoLiJinRecordService; /** * 获取淘宝的分享链接 * @@ -154,10 +163,20 @@ if (specialConvert) { if (!StringUtil.isNullOrEmpty(specialId)) { if (source != null && "taolijin".equals(source)) { taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId); } else { boolean isNewUser = userInfoExtraService.isNewUser(uid); if (isNewUser) { // 判定为老用户： 新人只要使用了新人红包，也就是那1块钱，那么，他看到的分享爆款中的商品-就只能分享。 long countRecord = userTaoLiJinRecordService.countRecordByUid(uid); if (countRecord == 0) { taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId); } } } if (taoBaoLink == null) { taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId); } data.put("native", true); } else { if (!specialConvert && !isNative) { fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -2220,7 +2220,7 @@ textStyleVO3.setContent("，好友"); textStyleVO3.setColor("#666666"); ClientTextStyleVO textStyleVO4 = new ClientTextStyleVO(); textStyleVO4.setContent("领红包"); textStyleVO4.setContent("领红包！"); textStyleVO4.setColor("#F14242"); List<ClientTextStyleVO> listText = new ArrayList<ClientTextStyleVO>(); @@ -2503,6 +2503,10 @@ continue; } if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) { continue; } // 是否需要弹出框 if (name.equals("账户等级特权")) { if (uid != null) { fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -179,60 +179,23 @@ } UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByUid(uid); String relationId = null; if (extraInfo != null && extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null && extraInfo.getRelationValid() == true) relationId = extraInfo.getRelationId(); if (source != null && "taolijin".equals(source)) { createTaoLijin(uid, auctionId, totalNum, relationId, request, out); return; } try { String relationId = null; if (extraInfo != null && extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null && extraInfo.getRelationValid() == true) relationId = extraInfo.getRelationId(); TaoBaoLink taoBaoLink = new TaoBaoLink(); if (source != null && "taolijin".equals(source)) { taoBaoLink = shareGoodsService.getTaoLiJinLinkForShare(uid, auctionId, relationId); } else { taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId); } TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId); JSONObject data = new JSONObject(); String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(), Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), auctionId + ""); if (source != null && "taolijin".equals(source)) { BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(taoBaoLink.getGoods()); // 推广红包 不能小于1 if (spreadMoney.compareTo(new BigDecimal(1)) < 0) { out.print(JsonUtil.loadFalseResult(1, "该商品淘礼金不足1元")); return; } data.put("spreadMoney", "淘礼金 ¥" + spreadMoney.toString()); String taoLiJinLink = null; try { UserTaoLiJinRecord record = userTaoLiJinRecordService.createShareTaoLiJin(uid, totalNum, taoBaoLink.getGoods()); taoLiJinLink = record.getSendUrl(); data.put("tljId", record.getId()); data.put("surplusMoney", record.getSurplusMoney()); } catch (UserTaoLiJinRecordException e) { out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg())); return; } // 创建淘口令 TaoBaoGoodsBrief goods = taoBaoLink.getGoods(); if (!StringUtil.isNullOrEmpty(taoLiJinLink)) {// 通过立即推广方式获取淘口令成功 String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoLiJinLink); if (!StringUtil.isNullOrEmpty(quanToken)) { taoBaoLink.setTaoToken(quanToken); } } else if (!StringUtil.isNullOrEmpty(taoBaoLink.getClickUrl())) { String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoBaoLink.getClickUrl()); if (!StringUtil.isNullOrEmpty(quanToken)) { taoBaoLink.setTaoToken(quanToken); } } } String shortLink = HttpUtil.getShortLink(url); if (!StringUtil.isNullOrEmpty(shortLink)) { @@ -258,32 +221,16 @@ MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + ""); } else// 有券 { if (source != null && "taolijin".equals(source)) { String text = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid); if (StringUtil.isNullOrEmpty(text)) text = configTaoLiJinService.getValueByKey("goods_share_text"); shareText = text.replace("{标题}", taoBaoLink.getGoods().getTitle()) .replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "") .replace("{优惠券面额}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString()) .replace("{淘礼金面额}", MoneyBigDecimalUtil.getWithNoZera(goodsTaoLiJinRateService.getGoodsSpreadMoney(taoBaoLink.getGoods())).toString()) .replace("{优惠券价}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + ""); } else { String text = shareGoodsTextTemplateService.geteCouponTemplate(uid); if (StringUtil.isNullOrEmpty(text)) text = configService.get("goods_share_text_coupon"); shareText = text.replace("{标题}", taoBaoLink.getGoods().getTitle()) .replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "") .replace("{优惠券面额}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString()) .replace("{优惠券价}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + ""); } String text = shareGoodsTextTemplateService.geteCouponTemplate(uid); if (StringUtil.isNullOrEmpty(text)) text = configService.get("goods_share_text_coupon"); shareText = text.replace("{标题}", taoBaoLink.getGoods().getTitle()) .replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "") .replace("{优惠券面额}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString()) .replace("{优惠券价}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + ""); } shareText = shareText.replace("{店铺类型}", shopType) .replace("{月销量}", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day())) @@ -354,8 +301,173 @@ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage())); businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + "")); } } /** * 淘礼金创建分享 * @param uid * @param auctionId * @param totalNum * @param relationId * @param request * @param out */ public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, HttpServletRequest request, PrintWriter out) { try { TaoBaoLink taoBaoLink = shareGoodsService.getTaoLiJinLinkForShare(uid, auctionId, relationId); TaoBaoGoodsBrief goods = taoBaoLink.getGoods(); BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods); // 推广红包 不能小于1 if (spreadMoney.compareTo(new BigDecimal(1)) < 0) { out.print(JsonUtil.loadFalseResult(1, "该商品淘礼金不足1元")); return; } JSONObject data = new JSONObject(); data.put("spreadMoney", "淘礼金 ¥" + spreadMoney.toString()); String taoLiJinLink = null; Long tljId = null; try { UserTaoLiJinRecord record = userTaoLiJinRecordService.createShareTaoLiJin(uid, totalNum, goods); tljId = record.getId(); taoLiJinLink = record.getSendUrl(); data.put("tljId", tljId); data.put("surplusMoney", record.getSurplusMoney()); } catch (UserTaoLiJinRecordException e) { out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg())); return; } String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&tid=%s", configService.getH5Host(), Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), auctionId + "", tljId); String shortLink = HttpUtil.getShortLink(url); if (!StringUtil.isNullOrEmpty(shortLink)) { url = shortLink; } data.put("clickUrl", url); // 创建淘口令 String taoToken = null; if (!StringUtil.isNullOrEmpty(taoLiJinLink)) {// 通过立即推广方式获取淘口令成功 String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoLiJinLink); if (!StringUtil.isNullOrEmpty(quanToken)) { taoToken = quanToken; } } else if (!StringUtil.isNullOrEmpty(taoBaoLink.getClickUrl())) { String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoBaoLink.getClickUrl()); if (!StringUtil.isNullOrEmpty(quanToken)) { taoToken = quanToken; } } data.put("token", taoToken); data.put("rule", "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0"); data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500)); // 无券 String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "淘宝价" : "天猫价"; String shareText = ""; if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) { String text = shareGoodsTextTemplateService.getCommonTemplate(uid); if (StringUtil.isNullOrEmpty(text)) text = configService.get("goods_share_text_nocoupon"); shareText = text.replace("{标题}", taoBaoLink.getGoods().getTitle()).replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + ""); } else// 有券 { String text = shareGoodsTextTemplateService.getTaoLiJinTemplate(uid); if (StringUtil.isNullOrEmpty(text)) text = configTaoLiJinService.getValueByKey("goods_share_text"); shareText = text.replace("{标题}", taoBaoLink.getGoods().getTitle()) .replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "") .replace("{优惠券面额}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString()) .replace("{淘礼金面额}", MoneyBigDecimalUtil.getWithNoZera(goodsTaoLiJinRateService.getGoodsSpreadMoney(taoBaoLink.getGoods())).toString()) .replace("{优惠券价}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + ""); } shareText = shareText.replace("{店铺类型}", shopType) .replace("{月销量}", TaoBaoUtil.getSaleCount(taoBaoLink.getGoods().getBiz30day())) .replace("{领券短链}", shortLink).replace("{淘口令}", taoBaoLink.getTaoToken()); data.put("shareText", shareText); String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim(); if (descText.startsWith("\\r\\n")) descText = descText.substring(0); data.put("descText", descText); String imgs = configService.get("goods_share_notify_imgs"); 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")); // 添加分享记录 BigDecimal rate = hongBaoManageService.getShareRate(); BigDecimal shareMoney = TaoBaoUtil.getShareGoodsHongBaoInfo(taoBaoLink.getGoods(), rate); data.put("shareMoney", "¥" + shareMoney.toString()); try { ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsDetail(uid, auctionId); data.put("shareId", shareRecord.getRedisKey()); } catch (Exception e) { try { LogHelper.errorDetailInfo(e); } catch (Exception e1) { e1.printStackTrace(); } } out.print(JsonUtil.loadTrueResult(data)); final TaoBaoLink taobaoLink = taoBaoLink; // 异步操作 com.yeshi.fanli.util.ThreadUtil.run(new Runnable() { @Override public void run() { // 异步操作 添加分享记录 UserShareGoodsHistory history = new UserShareGoodsHistory(); history.setUser(new UserInfo(uid)); history.setHongbao(shareMoney); history.setCreateTime(new Date()); history.setGoodsType(UserShareGoodsHistory.TYPE_TAOBAO); history.setTkCode(taobaoLink.getTaoToken()); history.setLink(taobaoLink.getClickUrl()); history.setQuanLink(taobaoLink.getCouponLink()); history.setGoodsId(taobaoLink.getGoods().getAuctionId()); history.setPostPicture(taobaoLink.getGoods().getPictUrl()); List<String> imgList = taobaoLink.getGoods().getImgList(); if (imgList == null) { imgList = new ArrayList<>(); } history.setPictures(JsonUtil.getGson().toJson(imgList)); shareGoodsService.addShareGoodsHistory(history); } }); return; } catch (ShareGoodsException e) { LogHelper.errorDetailInfo(e, "分享出错:uid:"+uid+"auctionId:"+auctionId, ""); // 分享出错报警 try { monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, e.getCode(), 0, "分享出错")); } catch (Exception e1) { } out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage())); businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + "")); } } /** * 分享记录统计列表 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
@@ -27,13 +27,13 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import com.yeshi.fanli.entity.accept.AcceptData; import com.yeshi.fanli.entity.bus.lable.QualityFactory; import com.yeshi.fanli.entity.bus.tlj.DeviceTaoLiJinRecord; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinDetail.TaoLiJinDetailTypeEnum; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin.TaoLiJinOriginEnum; import com.yeshi.fanli.entity.bus.user.UserMoneyExtra; import com.yeshi.fanli.entity.bus.user.UserRank; import com.yeshi.fanli.entity.taobao.ShareHotGoods; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra; import com.yeshi.fanli.exception.tlj.UserTaoLiJinOriginException; @@ -45,6 +45,7 @@ import com.yeshi.fanli.service.inter.lable.QualityGoodsService; import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service; import com.yeshi.fanli.service.inter.monitor.MonitorService; import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService; import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService; import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService; import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService; @@ -130,7 +131,11 @@ @Resource(name = "taskExecutor") private TaskExecutor executor; @Resource private ShareHotGoodsService shareHotGoodsService; /** * 获取淘礼金分享记录 * @@ -374,9 +379,9 @@ data.put("content", "自购直接抵现，优惠真实可见！"); data.put("type", 1); data.put("money", money.setScale(2).toString()); data.put("usage", "领取成功，已存入“我的-推广红包"); data.put("usage", "领取成功，已存入“我的-推广红包”"); data.put("jumpName", "去使用"); data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_taolijin_goods")); data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot")); data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip")); data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules")); @@ -409,9 +414,9 @@ data.put("content", "自购直接抵现，优惠真实可见！"); data.put("type", 1); data.put("money", hasMoney.setScale(2).toString()); data.put("usage", "领取成功，已存入“我的-推广红包"); data.put("usage", "领取成功，已存入“我的-推广红包”"); data.put("jumpName", "去使用"); data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_taolijin_goods")); data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot")); data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip")); } else if(type.equals(TaoLiJinOriginEnum.rankWin.name())) { @@ -455,9 +460,9 @@ data.put("content", "推广红包，好友福利！"); data.put("type", 1); data.put("money", hasMoney.setScale(2).toString()); data.put("usage", "领取成功，已存入“我的-推广红包"); data.put("usage", "领取成功，已存入“我的-推广红包”"); data.put("jumpName", "去使用"); data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_taolijin_goods")); data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot")); data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip")); } @@ -478,23 +483,18 @@ * @param out */ @RequestMapping(value = "getShareGoods", method = RequestMethod.POST) public void getShareGoods(AcceptData acceptData, Long uid, Integer page, PrintWriter out) { public void getShareGoods(AcceptData acceptData, Long uid, PrintWriter out) { if (uid == null || uid <= 0) { out.print(JsonUtil.loadFalseResult(1, "用户未登录")); return; } if (page == null || page < 1) { page = 1; String day = TimeUtil.getGernalTime(java.lang.System.currentTimeMillis()); List<ShareHotGoods> listHot = shareHotGoodsService.listByDay(day); if (listHot == null) { listHot = new ArrayList<ShareHotGoods>(); } int pageSize = 10; List<QualityFactory> listFreeGoods = qualityGoodsService.listFreeGoods((page - 1) * pageSize, pageSize); if (listFreeGoods == null) { listFreeGoods = new ArrayList<QualityFactory>(); } long count = listFreeGoods.size(); JSONArray array = new JSONArray(); Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) @@ -511,8 +511,8 @@ BigDecimal proportion = hongBaoManageService.getFanLiRate(); for (QualityFactory qualityFactory : listFreeGoods) { TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief(); for (ShareHotGoods hotGoods : listHot) { TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods(); if (taoBaoGoodsBrief == null) { continue; } @@ -547,7 +547,7 @@ }); JSONObject data = new JSONObject(); data.put("count", count); data.put("count", array.size()); data.put("list", array); out.print(JsonUtil.loadTrueResult(data)); } fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
@@ -10,7 +10,6 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.yeshi.utils.HttpUtil; import org.yeshi.utils.JsonUtil; import org.yeshi.utils.taobao.TbImgUtil; @@ -19,6 +18,7 @@ import com.yeshi.fanli.entity.bus.recommend.RecommendBanner; import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory; import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinRecord; import com.yeshi.fanli.entity.system.BusinessSystem; import com.yeshi.fanli.entity.taobao.ClientTBPid; import com.yeshi.fanli.entity.taobao.PidUser; @@ -157,8 +157,17 @@ */ private void doTaoLiJin(String callback, Long uid, Long tid, PrintWriter out) { String tljLink = ""; Long auctionId = null; BigDecimal tljMoney=null; // 查询商品淘礼金 UserTaoLiJinRecord record = userTaoLiJinRecordService.selectByPrimaryKey(tid); if (record == null) { out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("商品信息获取失败"))); return; } Long auctionId = record.getGoodsId(); BigDecimal tljMoney= record.getPerFace(); TaoBaoGoodsBrief goods = null; try { goods = redisManager.getTaoBaoGoodsBrief(auctionId); @@ -200,6 +209,7 @@ } else { data.put("coupon", false); } data.put("tljMoney", tljMoney); out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data))); @@ -364,13 +374,6 @@ data.put("coupon", false); // 老版本兼容 data.put("quan", true); } // 查询商品淘礼金 BigDecimal taoLiJin = userTaoLiJinRecordService.getShareHongBaoByUidAndGoodsId(Long.parseLong(uid), Long.parseLong(id)); if (taoLiJin != null && taoLiJin.compareTo(new BigDecimal(0)) == 1) { data.put("taoLiJin", "可获淘礼金红包 ¥" + taoLiJin); } out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data))); fanli/src/main/java/com/yeshi/fanli/mapping/tlj/UserTaoLiJinRecordMapper.xml
@@ -38,7 +38,7 @@ <select id="getRecordByUid" resultMap="ResultVOMap"> SELECT * FROM yeshi_ec_user_taolijin_record d LEFT JOIN yeshi_ec_user_taolijin_report p ON d.`utlj_rights_id` = p.`utr_id` WHERE d.`utlj_uid` = #{uid} WHERE d.`utlj_uid` = #{uid} AND p.`utr_id` IS NOT NULL ORDER BY d.`utlj_create_time` DESC LIMIT ${start},${count} </select> fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
@@ -771,7 +771,6 @@ goods.setCouponLink(goods.getCouponLink() + "&relationId=" + relationId); } // 保存商品详情 // 创建淘口令 TaoBaoLink tbLink = new TaoBaoLink(); fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
@@ -350,8 +350,6 @@ } else { userTaoLiJinRecordVO.setUserType(1); } listGoods.remove(i); break; } }
