替换原来老的资金详情

admin

2018-12-25 4cb15e222cd7d099d533ccbeb7f9a8cd99bf180c

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java

@@ -270,7 +270,7 @@


   @Override

   public void synOldOrder(List<TaoBaoOrder> tborderList) {

      BigDecimal rate = new BigDecimal(hongBaoManageService.get("hongbao_goods_proportion"));

      BigDecimal  rate = hongBaoManageService.getFanLiRate();

      Map<String, Order> map = new HashMap<String, Order>();

      tborderList.stream().forEach((tbo) -> {

         Order order = map.get(tbo.getOrderId());

@@ -307,7 +307,7 @@
   @Override

   public void processOrderItem(String orderId, List<TaoBaoOrder> orderList) {

      List<OrderItem> orderItemList = orderItemMapper.findOrderByOrderIdAndTypeAndVersion(orderId, 1, 2);

      BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue());

      BigDecimal  rate = hongBaoManageService.getFanLiRate();

      Order order = orderMapper.selectOrderByOrderId(orderId);

      // 尚未插入子订单

      if (orderItemList == null || orderItemList.size() == 0) {

@@ -471,8 +471,22 @@
         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()) {