fix 计费单商品

zhongzheng-common/src/main/java/com/zhongzheng/common/core/controller/BaseController.java

@@ -73,8 +73,6 @@ public class BaseController
         rspData.setMsg("查询成功");
         rspData.setRows(list);
         rspData.setTotal(new PageInfo(list).getTotal());
-        System.out.println(rspData.getTotal());
-        System.out.println("HAHA");
         return rspData;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -73,5 +73,5 @@ private static final long serialVersionUID=1L;
     private String remark;
     /** 班级id */
     private Long classId;
-   
+
 }

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

@@ -147,7 +147,10 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
                 throw new CustomException("已收费用必须大于0");
             }
             //订单商品
-            OrderGoods goods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn, bo.getOrderSn()).eq(OrderGoods::getGoodsId,g.getGoodsId()));
+            OrderGoods goods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderSn, g.getOrderSn()).eq(OrderGoods::getGoodsId,g.getGoodsId()));
+            if(goods==null){
+                throw new CustomException("订单商品错误");
+            }
             //计费单已收费用累加
             goods.setGoodsReceived(goods.getGoodsReceived().add(orderGoods.getAmount()));
             if(goods.getGoodsRealPrice().compareTo(goods.getGoodsReceived()) == -1){