唯品会订单bug修复，APP端佣金比例展示错误bug修复

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java

@@ -13,6 +13,7 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



public class CommonOrderFactory {



@@ -134,11 +135,15 @@
      CommonOrder commonOrder = new CommonOrder();

      commonOrder.setCount(taoBaoOrder.getCount());

      commonOrder.setCreateTime(new Date());



      // 如果relationId不为空



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

      commonOrder.setSettlement(taoBaoOrder.getSettlement());

@@ -166,6 +171,13 @@
      commonOrder.setTradeId(taoBaoOrder.getTradeId());

      commonOrder.setChildSourceType(taoBaoOrder.getOrderType());



      if (!StringUtil.isNullOrEmpty(taoBaoOrder.getRelationId())) {

         commonOrder.setEstimate(

               TaoBaoUtil.getCanShareMoney(commonOrder.getThirdCreateTime(), commonOrder.getEstimate()));

         commonOrder.seteIncome(

               TaoBaoUtil.getCanShareMoney(commonOrder.getThirdCreateTime(), commonOrder.geteIncome()));

      }



      return commonOrder;

   }