Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -1089,6 +1089,22 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                List<BusOrderFee> feeItems = getLivingOrderFee(bookingOrderId).stream().filter(
                        s->s.getPreferentialStatus().equals(1)// 找到未结账的
                 ).collect(Collectors.toList());
+
+
+               BigDecimal shoukuan = new BigDecimal(0);
+               BigDecimal xiaofei = new BigDecimal(0);
+
+                feeItems.forEach(c->{
+                    if(c.getFeeType().equals(1)) { // 收款
+                        shoukuan.add(c.getMoney());
+                    } else if(c.getFeeType().equals(2)) { // 消费
+                        xiaofei.add(c.getMoney());
+                    }
+                });
+                BigDecimal m = shoukuan .subtract(xiaofei);
+                settleFees.get(0).setMoney(m);
+                if(m.doubleValue() < 0) settleFees.get(0).setCustorerOrderRemark("结账退款");
+                else settleFees.get(0).setCustorerOrderRemark("结账收款");
 //               // 消费账单
 //                List<BusOrderFee> xiaoFeiFees = feeItems.stream().filter(s->s.getFeeType().equals(1)).collect(Collectors.toList());
 //                // 收款