Administrator
2018-11-26 31d6bd3dd8163a5d6c182110dcf21e94b4770dac
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java
@@ -474,17 +474,19 @@
         updateOrderItem.setPayMoney(newOrderItem.getPayMoney());
         updateOrderItem.setFanMoney(newOrderItem.getFanMoney());
         orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);
      } else if (newOrderItem.getState() == OrderItem.STATE_JIESUAN) {
         OrderItem updateOrderItem = new OrderItem();
         // 处理正常状态
         updateOrderItem.setId(oldOrderItem.getId());
         updateOrderItem.setSettlementTime(newOrderItem.getSettlementTime());
         updateOrderItem.setState(newOrderItem.getState());
         updateOrderItem.setPrePayMoney(taoBaoOrder.getPrice().multiply(new BigDecimal(taoBaoOrder.getCount())));
         updateOrderItem.setPayMoney(newOrderItem.getPayMoney());
         updateOrderItem.setFanMoney(newOrderItem.getFanMoney());
         orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);
      }
      }
//      else if (newOrderItem.getState() == OrderItem.STATE_JIESUAN) {
//         OrderItem updateOrderItem = new OrderItem();
//         // 处理正常状态
//         updateOrderItem.setId(oldOrderItem.getId());
//         // updateOrderItem.setSettlementTime(newOrderItem.getSettlementTime());
//         // updateOrderItem.setState(newOrderItem.getState());
//         updateOrderItem.setPrePayMoney(taoBaoOrder.getPrice().multiply(new BigDecimal(taoBaoOrder.getCount())));
//         updateOrderItem.setPayMoney(newOrderItem.getPayMoney());
//         updateOrderItem.setFanMoney(newOrderItem.getFanMoney());
//         orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);
//      }
      // 更新分销状态
      if (oldOrderItem.getIsGift()) {