submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -1007,6 +1007,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             List<OrderGoods> orderGoodsList = iOrderGoodsService
                     .list(new LambdaQueryWrapper<OrderGoods>()
                             .eq(OrderGoods::getOrderSn, add.getOrderSn())
+                            .ne(OrderGoods::getRefundStatus,2)
                             .eq(OrderGoods::getStatus, 1));
             TopCostTpVo topCostTpVo = BeanUtil.toBean(costTp, TopCostTpVo.class);
             //成本项

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -614,7 +614,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         BigDecimal costTotal = new BigDecimal("0.00");//成本
         BigDecimal profitTotal = new BigDecimal("0.00"); //盈亏
         List<TopOldOrderGoods> orderGoodsList = topOrderGoodsService.list(new LambdaQueryWrapper<TopOldOrderGoods>()
-                .eq(TopOldOrderGoods::getOrderSn, order.getOrderSn()).ne(TopOldOrderGoods::getCheckStatus, -1).eq(TopOldOrderGoods::getStatus, 1));
+                .eq(TopOldOrderGoods::getOrderSn, order.getOrderSn()).in(TopOldOrderGoods::getCheckStatus, Arrays.asList(0,1)).eq(TopOldOrderGoods::getStatus, 1));
         //佣金
         BigDecimal brokerage = order.getPretaxBrokerage();
         //平摊佣金
@@ -2263,6 +2263,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             List<OrderGoods> orderGoodsList = orderGoodsService
                     .list(new LambdaQueryWrapper<OrderGoods>()
                             .eq(OrderGoods::getOrderSn, order.getOrderSn())
+                            .ne(OrderGoods::getRefundStatus,2)
                             .eq(OrderGoods::getStatus, 1));
 
             //成本项
@@ -2387,6 +2388,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             List<TopOldOrderGoods> orderGoodsList = topOrderGoodsService
                     .list(new LambdaQueryWrapper<TopOldOrderGoods>()
                             .eq(TopOldOrderGoods::getOrderSn, order.getOrderSn())
+                            .eq(TopOldOrderGoods::getCheckStatus,Arrays.asList(0,1))
                             .eq(TopOldOrderGoods::getStatus, 1));
             if (ObjectUtils.isNotNull(order.getPretaxBrokerage()) && order.getPretaxBrokerage().compareTo(BigDecimal.ZERO) != 0){
                 halveBrokerage = brokerage.divide(new BigDecimal(orderGoodsList.size()),4,BigDecimal.ROUND_DOWN);
@@ -2779,6 +2781,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 List<OrderGoods> orderGoodsList = orderGoodsService
                         .list(new LambdaQueryWrapper<OrderGoods>()
                                 .eq(OrderGoods::getOrderSn, orderSn)
+                                .ne(OrderGoods::getRefundStatus,2)
                                 .eq(OrderGoods::getStatus, 1));
 
                 //成本项