admin
2019-08-26 d28bed1a1275131a5ca37f7da37961e2b518ac07
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java
@@ -21,6 +21,12 @@
         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));
@@ -40,7 +46,7 @@
      } else if (1 == order.getOrderStatus()) {
         state = CommonOrder.STATE_FK;
      } else if (2 == order.getOrderStatus()) {
         state = CommonOrder.STATE_FK;
         state = CommonOrder.STATE_JS;
      } else if (3 == order.getOrderStatus()) {
         state = CommonOrder.STATE_FK;
      } else if (4 == order.getOrderStatus()) {