Merge remote-tracking branch 'origin/mater-1.6.0' into div

admin

2019-08-19 9c09cead959dbeef292628f345e5f80c30fc3d17

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