|
@@ -126,7 +126,7 @@ private IBusRoomBookingOrdersService busRoomBookingOrdersService;
|
|
|
@ApiOperation(value="pos_order_goods-添加", notes="pos_order_goods-添加")
|
|
@ApiOperation(value="pos_order_goods-添加", notes="pos_order_goods-添加")
|
|
|
//@RequiresPermissions("pos:pos_order_goods:add")
|
|
//@RequiresPermissions("pos:pos_order_goods:add")
|
|
|
@PostMapping(value = "/add")
|
|
@PostMapping(value = "/add")
|
|
|
- public Result<PosOrderGoods> add(@RequestBody PosOrderGoods posOrderGoods) {
|
|
|
|
|
|
|
+ public Result<PosOrderGoods> add(@RequestBody PosOrderGoods posOrderGoods,String hotelId) {
|
|
|
if (ObjectUtils.isEmpty(posOrderGoods.getPosOrderGoodsDetailList())) {
|
|
if (ObjectUtils.isEmpty(posOrderGoods.getPosOrderGoodsDetailList())) {
|
|
|
return Result.error("请先选择商品");
|
|
return Result.error("请先选择商品");
|
|
|
}
|
|
}
|
|
@@ -192,7 +192,7 @@ private IBusRoomBookingOrdersService busRoomBookingOrdersService;
|
|
|
busOrderFee.setMoney(posOrderGoods.getMoney());
|
|
busOrderFee.setMoney(posOrderGoods.getMoney());
|
|
|
busOrderFee.setSubjectType(FeeSubjectType.DIAN_PIN.getKey());
|
|
busOrderFee.setSubjectType(FeeSubjectType.DIAN_PIN.getKey());
|
|
|
fees.add(busOrderFee);
|
|
fees.add(busOrderFee);
|
|
|
- busRoomBookingOrdersService.setLivingOrderFee(fees, posOrderGoods.getToRoomFeeOrderId());
|
|
|
|
|
|
|
+ busRoomBookingOrdersService.setLivingOrderFee(fees, posOrderGoods.getToRoomFeeOrderId(),hotelId);
|
|
|
}
|
|
}
|
|
|
Boolean res = posOrderGoodsService.saveOrUpdate(posOrderGoods);
|
|
Boolean res = posOrderGoodsService.saveOrUpdate(posOrderGoods);
|
|
|
if (res) {
|
|
if (res) {
|
