Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -15,16 +15,23 @@
      CommonOrder commonOrder = new CommonOrder();

      commonOrder.setCount(order.getGoodsQuantity());

      commonOrder.setCreateTime(new Date());

      if (order.getOrderStatus() == 3) {

      if (order.getOrderStatus() == 3) {// 审核通过

         commonOrder.seteIncome(

               MoneyBigDecimalUtil.div(new BigDecimal(order.getPromotionAmount()), new BigDecimal(100)));

         commonOrder.setSettlement(

               MoneyBigDecimalUtil.div(new BigDecimal(order.getOrderAmount()), new BigDecimal(100)));// 结算金额

         commonOrder.setSettleTime(new Date(order.getOrderVerifyTime() * 1000));

      } else if (order.getOrderStatus() == 2) {// 确认收货归为审核通过

         commonOrder.seteIncome(

               MoneyBigDecimalUtil.div(new BigDecimal(order.getPromotionAmount()), new BigDecimal(100)));

         commonOrder.setSettlement(

               MoneyBigDecimalUtil.div(new BigDecimal(order.getOrderAmount()), new BigDecimal(100)));// 结算金额

         commonOrder.setSettleTime(new Date(order.getOrderReceiveTime() * 1000));

      } else {

         commonOrder.seteIncome(new BigDecimal(0));

         commonOrder.setSettlement(new BigDecimal(0));

      }



      commonOrder

            .setEstimate(MoneyBigDecimalUtil.div(new BigDecimal(order.getPromotionAmount()), new BigDecimal(100)));

      commonOrder.setOrderNo(order.getOrderSn());

@@ -38,13 +45,16 @@
      } else if (0 == order.getOrderStatus()) {

         state = CommonOrder.STATE_FK;

      } else if (1 == order.getOrderStatus()) {

         state = CommonOrder.STATE_FK;

      } else if (2 == order.getOrderStatus()) {

         state = CommonOrder.STATE_FK;

         state = CommonOrder.STATE_FK;
      } else if (2 == order.getOrderStatus()) {// 确认收货
         state = CommonOrder.STATE_JS;

      } else if (3 == order.getOrderStatus()) {

         state = CommonOrder.STATE_FK;

      } else if (4 == order.getOrderStatus()) {

         state = CommonOrder.STATE_WQ;

         if (order.getOrderReceiveTime() == null || order.getOrderReceiveTime() == 0)

            state = CommonOrder.STATE_SX;

         else

            state = CommonOrder.STATE_WQ;

      } else if (5 == order.getOrderStatus()) {

         state = CommonOrder.STATE_JS;

      } else if (8 == order.getOrderStatus()) {

@@ -89,6 +99,7 @@
      commonOrder.setThirdCreateTime(new Date(order.getOrder().getOrderTime()));

      commonOrder.setUpdateTime(new Date());

      commonOrder.setTradeId(order.getTradeId());

      commonOrder.setEstimate(order.getEstimateFee());

      return commonOrder;

   }