签到弹框bug

yujian

2019-08-20 df300df7832cc3d24f1b09297998e8bee8cfd126

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

@@ -44,7 +44,10 @@
      } 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 +92,7 @@
      commonOrder.setThirdCreateTime(new Date(order.getOrder().getOrderTime()));

      commonOrder.setUpdateTime(new Date());

      commonOrder.setTradeId(order.getTradeId());

      commonOrder.setEstimate(order.getEstimateFee());

      return commonOrder;

   }