fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -80,9 +80,9 @@ import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerV2Service; import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService; import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService; import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService; import com.yeshi.fanli.service.inter.homemodule.DeviceSexService; import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService; import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService; import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService; import com.yeshi.fanli.service.inter.homemodule.DeviceSexService; import com.yeshi.fanli.service.inter.homemodule.SpecialService; import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService; import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService; @@ -98,7 +98,6 @@ import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService; import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService; import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService; import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService; import com.yeshi.fanli.service.inter.user.ShamUserService; @@ -121,6 +120,7 @@ import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import com.yeshi.fanli.util.taobao.TaoLiJinUtil; import com.yeshi.fanli.vo.msg.ClientTextStyleVO; import com.yeshi.fanli.vo.tlj.SpreadHongBao; import com.yeshi.fanli.vo.user.UserSettingsVO; @@ -239,9 +239,6 @@ @Resource private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService; @Resource private GoodsTaoLiJinRateService goodsTaoLiJinRateService; @Resource private UserMoneyExtraService userMoneyExtraService; @@ -2185,9 +2182,12 @@ // 推广红包 if (from != null && from.equals("taolijin")) { BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods); // 计算推广红包 String warningRate = configTaoLiJinService.getValueByKey("warning_value"); BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods); // 推广红包 不能小于1 if (spreadMoney.compareTo(new BigDecimal(1)) < 0) { if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) { out.print(JsonUtil.loadFalseResult(2, "商品不存在")); return; } fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -50,7 +50,6 @@ import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service; import com.yeshi.fanli.service.inter.monitor.MonitorService; import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService; import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService; import com.yeshi.fanli.service.inter.user.SpreadUserImgService; import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService; @@ -69,6 +68,7 @@ import com.yeshi.fanli.util.factory.MonitorFactory; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import com.yeshi.fanli.util.taobao.TaoLiJinUtil; import com.yeshi.fanli.vo.msg.ClientTextStyleVO; import net.sf.json.JSONArray; @@ -134,9 +134,6 @@ @Resource private ConfigTaoLiJinService configTaoLiJinService; @Resource private GoodsTaoLiJinRateService goodsTaoLiJinRateService; @Resource private UserTaoLiJinRecordService userTaoLiJinRecordService; @@ -319,10 +316,14 @@ TaoBaoGoodsBrief goods = taoBaoLink.getGoods(); BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods); // 计算推广红包 String warningRate = configTaoLiJinService.getValueByKey("warning_value"); BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods); // 推广红包 不能小于1 if (spreadMoney.compareTo(new BigDecimal(1)) < 0) { out.print(JsonUtil.loadFalseResult(1, "该商品淘礼金不足1元")); if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) { out.print(JsonUtil.loadFalseResult(1, "该商品淘礼金不足")); return; } @@ -390,7 +391,7 @@ .replace("{商品原价}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getZkPrice()) + "") .replace("{优惠券面额}", MoneyBigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString()) .replace("{淘礼金面额}", MoneyBigDecimalUtil.getWithNoZera(goodsTaoLiJinRateService.getGoodsSpreadMoney(taoBaoLink.getGoods())).toString()) .replace("{淘礼金面额}", MoneyBigDecimalUtil.getWithNoZera(spreadMoney).toString()) .replace("{优惠券价}", TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()) + ""); }
@@ -48,7 +48,6 @@ 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; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService; @@ -58,9 +57,11 @@ import com.yeshi.fanli.service.inter.user.UserMoneyExtraService; import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoLiJinUtil; import com.yeshi.fanli.vo.msg.ClientTextStyleVO; import com.yeshi.fanli.vo.tlj.TaoLiJinDetailVO; import com.yeshi.fanli.vo.user.UserTaoLiJinRecordVO; @@ -119,9 +120,6 @@ @Resource private QualityGoodsService qualityGoodsService; @Resource private GoodsTaoLiJinRateService goodsTaoLiJinRateService; @Resource private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService; @@ -517,13 +515,16 @@ continue; } TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null); // 计算推广红包 String warningRate = configTaoLiJinService.getValueByKey("warning_value"); BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, taoBaoGoodsBrief); BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(taoBaoGoodsBrief); // 推广红包 不能小于1 if (spreadMoney.compareTo(new BigDecimal(1)) < 0) { if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) { continue; } TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null); // 去掉标签 extra.setLabels(null);
File was deleted fanli/src/main/java/com/yeshi/fanli/entity/bus/tlj/GoodsTaoLiJinRate.java
File was deleted fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
@@ -21,12 +21,13 @@ /** * 更新报告 */ @Scheduled(cron = "0 0 0 * * ?") // @Scheduled(cron = "0 0 0 * * ?") @Scheduled(cron = "0 0/5 * * * ?") public void insetDynamicInfo() { if (!Constant.IS_TASK) { return; } // if (!Constant.IS_TASK) { // return; // } try { userTaoLiJinReportService.needUpdateReport(); fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
@@ -42,7 +42,6 @@ import com.yeshi.fanli.service.inter.goods.ShareGoodsService; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService; import com.yeshi.fanli.service.inter.user.TBPidService; import com.yeshi.fanli.service.inter.user.UserAccountService; @@ -99,9 +98,6 @@ @Resource private UserMoneyExtraService userMoneyExtraService; @Resource private GoodsTaoLiJinRateService goodsTaoLiJinRateService; @Resource private UserTaoLiJinRecordService userTaoLiJinRecordService; fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsTextTemplateServiceImpl.java
@@ -15,8 +15,9 @@ import com.yeshi.fanli.exception.goods.ShareGoodsTextTemplateException; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.goods.ShareGoodsTextTemplateService; import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService; import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoLiJinUtil; /** * 分享商品模板 @@ -34,8 +35,10 @@ private ConfigService configService; @Resource private GoodsTaoLiJinRateService goodsTaoLiJinRateService; private ConfigTaoLiJinService configTaoLiJinService; @Override public void saveCommonTemplate(Long uid, String template) throws ShareGoodsTextTemplateException { isCommonTemplateRight(template); @@ -167,7 +170,10 @@ String shortLink, boolean hasCoupon, Long tljId) { if (tljId != null) { BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods); // 计算推广红包 String warningRate = configTaoLiJinService.getValueByKey("warning_value"); BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods); return template.replace("{标题}", goods.getTitle()).replace("{商品原价}", BigDecimalUtil.getWithNoZera( goods.getZkPrice()).toString()) .replace("{月销量}", TaoBaoUtil.getSaleCount(goods.getBiz30day())).replace("{领券短链}", shortLink) .replace("{淘口令}", token).replace("{优惠券面额}", BigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString()) fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/GoodsTaoLiJinRateServiceImpl.java
File was deleted fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java
@@ -29,7 +29,7 @@ import com.yeshi.fanli.service.inter.goods.CommonGoodsService; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService; import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService; import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService; @@ -40,6 +40,7 @@ import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.factory.CommonGoodsFactory; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; import com.yeshi.fanli.util.taobao.TaoLiJinUtil; import com.yeshi.fanli.vo.msg.ClientTextStyleVO; import com.yeshi.fanli.vo.user.UserTaoLiJinRecordVO; @@ -74,7 +75,7 @@ private UserTaoLiJinOriginService userTaoLiJinOriginService; @Resource private GoodsTaoLiJinRateService goodsTaoLiJinRateService; private ConfigTaoLiJinService configTaoLiJinService; @Resource private UserOtherMsgNotificationService userOtherMsgNotificationService; @@ -155,8 +156,10 @@ if (isNewUser) { perface = new BigDecimal(1); } else { perface = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods); } // 计算推广红包 String warningRate = configTaoLiJinService.getValueByKey("warning_value"); perface = TaoLiJinUtil.getSpreadMoney(warningRate, goods); } return createUserTaoLiJin(2, uid, goods.getAuctionId(), perface, totalNum, name, sendStartTime, sendEndTime, null, useEndTime); fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/GoodsTaoLiJinRateService.java
File was deleted fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoLiJinUtil.java
New file @@ -0,0 +1,27 @@ package com.yeshi.fanli.util.taobao; import java.math.BigDecimal; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.util.MoneyBigDecimalUtil; /** * 淘礼金 * * @author Administrator * */ public class TaoLiJinUtil { /** * 根据商品计算推广红包 * @param warningRate * @param goodsBrief * @return */ public static BigDecimal getSpreadMoney(String warningRate, TaoBaoGoodsBrief goodsBrief) { BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief,new BigDecimal(100)); return MoneyBigDecimalUtil.mul(new BigDecimal(Integer.parseInt(warningRate) * 0.01), spreadMoney); } }
