队员排行榜bug

yujian

2020-05-26 646196c8b6f46b1156189f0d3a16fb6c5200c789

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

@@ -7,6 +7,7 @@
import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.pdd.PDDOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.vipshop.VipShopOrderDetail;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

@@ -166,4 +167,37 @@


      return commonOrder;

   }



   public static CommonOrder create(VipShopOrderDetail order) {

      if (order.getOrder() == null)

         return null;

      CommonOrder commonOrder = new CommonOrder();

      commonOrder.setCount(order.getGoodsCount());

      commonOrder.setCreateTime(new Date());

      if (order.getStatus() == VipShopOrderDetail.STATUS_FINISH) {

         commonOrder.seteIncome(order.getCommission());

         commonOrder.setSettlement(order.getCommissionTotalCost());

         commonOrder.setSettleTime(new Date(order.getOrder().getCommissionEnterTime()));

      }

      commonOrder.setOrderNo(order.getOrderSn() + "");

      commonOrder.setPayment(order.getCommissionTotalCost());

      commonOrder.setSourcePosition(order.getOrder().getChannelTag());

      commonOrder.setSourceType(Constant.SOURCE_TYPE_VIP);

      int state = 0;

      if (order.getStatus() == VipShopOrderDetail.STATUS_FINISH)

         state = CommonOrder.STATE_JS;

      else if (order.getStatus() == VipShopOrderDetail.STATUS_INVALID)

         state = CommonOrder.STATE_SX;

      else if (order.getStatus() == VipShopOrderDetail.STATUS_UNKOWN)

         state = CommonOrder.STATE_FK;



      commonOrder.setOrderBy(1);

      commonOrder.setState(state);

      commonOrder.setThirdCreateTime(new Date(order.getOrder().getOrderTime()));

      commonOrder.setUpdateTime(new Date());

      commonOrder.setTradeId(order.getIdentifyCode());

      commonOrder.setEstimate(order.getCommission());

      commonOrder.setChildSourceType("唯品会");

      return commonOrder;

   }

}