奖励券使用区分订单下单三方日期

yujian

2019-08-28 d88c167fc5973a2c15ff1539e4cdab36e4a7842c

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java

@@ -2185,6 +2185,8 @@
      // 红包

      if (hongBao == null) {

         BigDecimal proportion = manageService.getFanLiRate();

         if ("taolijin".equalsIgnoreCase(from))

            proportion = manageService.getTLJShareRate(System.currentTimeMillis());

         hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);

      }

      goodsJson.put("hongBao", hongBao);

@@ -2273,7 +2275,7 @@
      // 推广红包

      if (from != null && from.equals("taolijin")) {

         // 计算推广红包

         String warningRate = configTaoLiJinService.getValueByKey("warning_value",null);

         String warningRate = configTaoLiJinService.getValueByKey("warning_value", null);

         BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);



         // 推广红包 不能小于1

@@ -2332,7 +2334,7 @@
            data.put("userHongbao", userMoneyExtra.getTlj().setScale(2).toString());

         }



         noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link",null);

         noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link", null);



         if (Constant.IS_TEST) {

            fanliValid = true;