收藏信息更新

Administrator

2018-11-26 31d6bd3dd8163a5d6c182110dcf21e94b4770dac

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoOrderUtil.java

@@ -674,8 +674,15 @@
      orderItem.setSettlementTime(0L);

      String createTime = tbo.getCreateTime();

      orderItem.setCreateTime(TimeUtil.convertDateToTemp2(createTime));

      orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.getEstimate()));

      orderItem.setPayMoney(tbo.getPayment());

      if ("订单结算".equalsIgnoreCase(tbo.getOrderState()))

         orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.geteIncome()));

      else

         orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.getEstimate()));

      if ("订单结算".equalsIgnoreCase(tbo.getOrderState()))

         orderItem.setPayMoney(tbo.getSettlement());

      else

         orderItem.setPayMoney(tbo.getPayment());



      orderItem.setOrder(order);

      orderItem.setOrderId(tbo.getOrderId());



@@ -809,7 +816,10 @@
      pidOrder.setOrderType(taoBaoOrder.getOrderType());

      pidOrder.setRate(taoBaoOrder.getiRatio());

      pidOrder.setPayMoney(taoBaoOrder.getPayment());

      pidOrder.setPreMoney(taoBaoOrder.getEstimate());

      if ("订单结算".equalsIgnoreCase(taoBaoOrder.getOrderState()))

         pidOrder.setPreMoney(taoBaoOrder.geteIncome());

      else

         pidOrder.setPreMoney(taoBaoOrder.getEstimate());

      pidOrder.setFinalMoney(taoBaoOrder.getSettlement());

      if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime()))

         pidOrder.setBalanceTime(new Date(TimeUtil.convertDateToTemp2(taoBaoOrder.getSettlementTime())));