奖励券使用优化类型

yujian

2019-07-19 8222e8b237c5dfb0affcdc03335bfadc06403bf8

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

@@ -710,7 +710,10 @@
      CommonOrder commonOrder = new CommonOrder();

      commonOrder.setCount(taoBaoOrder.getCount());

      commonOrder.setCreateTime(new Date());

      commonOrder.seteIncome(taoBaoOrder.geteIncome());

      if (taoBaoOrder.geteIncome() != null && taoBaoOrder.getSubsidy() != null)

         commonOrder.seteIncome(taoBaoOrder.geteIncome().add(taoBaoOrder.getSubsidy()));

      else

         commonOrder.seteIncome(taoBaoOrder.geteIncome());

      commonOrder.setEstimate(taoBaoOrder.getEstimate());

      commonOrder.setOrderNo(taoBaoOrder.getOrderId());

      commonOrder.setPayment(taoBaoOrder.getPayment());