fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -383,8 +383,9 @@ // 计算推广红包 String warningRate = configTaoLiJinService.getValueByKey("warning_value", new Date()); LogHelper.error("推广红包比例:"+warningRate); BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods); LogHelper.error("推广红包:"+spreadMoney); // 推广红包 不能小于1 if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) { out.print(JsonUtil.loadFalseResult(1, "该商品淘礼金不足")); @@ -491,7 +492,7 @@ out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(shareInfo))); final TaoBaoLink taobaoLink = taoBaoLink; final TaoBaoGoodsBrief finalGoods=goods; final TaoBaoGoodsBrief finalGoods = goods; // 异步操作 com.yeshi.fanli.util.ThreadUtil.run(new Runnable() { @Override fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java
@@ -34,7 +34,11 @@ * @param jdOrderList */ public void savePDDOrders(List<PDDOrder> orderList) { for (PDDOrder order : orderList) for (PDDOrder order : orderList) { if (order.getOrderStatus() == 2) { System.out.println(order); } try { pddOrderService.addOrder(order); /** @@ -49,6 +53,7 @@ } catch (PDDOrderException e) { e.printStackTrace(); } } } /** fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -234,9 +234,11 @@ if (hongBaoList != null && hongBaoList.size() > 0) { CommonOrder commonOrder = commonOrderMapper.selectBySourceTypeAndTradeId(sourceType, tradeId); if (commonOrder != null && commonOrder.getSettlement().compareTo(new BigDecimal(0)) > 0) { BigDecimal wqMoney = MoneyBigDecimalUtil.mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney()) .divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP); BigDecimal wqMoney = MoneyBigDecimalUtil .mul(hongBaoList.get(0).getMoney(), weiQuanOrder.getMoney()) .divide(commonOrder.getSettlement(), 2, BigDecimal.ROUND_UP); if (wqMoney.compareTo(hongBaoList.get(0).getMoney()) > 0) wqMoney = hongBaoList.get(0).getMoney(); weiQuanMoney = weiQuanMoney.add(wqMoney); } } @@ -448,15 +450,17 @@ orderStateContent = "维权成功"; WeiQuanInfo weiQuanInfo = new WeiQuanInfo(); weiQuanInfo.setOldHongBao("¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString()); // if (isPart) { weiQuanInfo.setWqHongBao( "维权：-¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString()); hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney); // } else { // weiQuanInfo // .setWqHongBao("维权：-¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString()); // hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney); // } // if (isPart) { weiQuanInfo .setWqHongBao("维权：-¥" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString()); hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney); // } else { // weiQuanInfo // .setWqHongBao("维权：-¥" + weiQuanMoney.setScale(2, // BigDecimal.ROUND_DOWN).toString()); // hongBao = MoneyBigDecimalUtil.sub(hongBao, // weiQuanMoney); // } order.setWeiQuanInfo(weiQuanInfo); } } fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoLiJinUtil.java
@@ -6,22 +6,23 @@ 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); BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, new BigDecimal(100)); return MoneyBigDecimalUtil.mul(new BigDecimal(warningRate).multiply(new BigDecimal("0.01")), spreadMoney); } }
