设备消息BUG解决，品牌

admin

2019-06-14 1e92eff67b997263ecefa255c63eb6641c47b57f

 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());