|
|
@@ -129,6 +129,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
|
|
|
@Resource
|
|
|
private CesHourRoomRuleServiceImpl hourRoomRuleService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private IBusOrderFeeGoodsService orderFeeGoodsService;
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public String bookingOrderSave(BookingOrderSaveDto item, Boolean isTeam,Boolean isLiving,String hotelId) {
|
|
|
@@ -1494,6 +1497,10 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
|
|
|
roomFee.setCreateTime(new Date());
|
|
|
roomFee.setDayTime(new Date());
|
|
|
roomFee.setHotelId(hotelId);
|
|
|
+ if(roomFee.getSubjectType().equals(FeeSubjectType.SHANG_PIN.getKey()) && roomFee.getFeeGoods() != null && roomFee.getFeeGoods().size() > 0) {
|
|
|
+ // 判断是否相等 搞尼玛~傻逼
|
|
|
+ orderFeeGoodsService.saveBatch(roomFee.getFeeGoods());
|
|
|
+ }
|
|
|
feeService.save(roomFee);
|
|
|
});
|
|
|
|
|
|
@@ -2512,4 +2519,41 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Boolean 退你妈的单(List<String> feeIds) {
|
|
|
+ if(feeIds == null || feeIds.size() == 0) throw new JeecgBootException("参数错误");
|
|
|
+ feeIds.forEach(s->{
|
|
|
+ 狗麻批退单个(s);
|
|
|
+ });
|
|
|
+ return true;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ private void 狗麻批退单个(String feeId){
|
|
|
+ BusOrderFee fee = feeService.getById(feeId);
|
|
|
+ if(fee==null) throw new JeecgBootException("费项不存在");
|
|
|
+ if(fee.getSubjectType().equals(FeeSubjectType.MEI_RI_FANG_FEI.getKey()) || fee.getSubjectType().equals(FeeSubjectType.YA_JIN.getKey()) || fee.getSubjectType().equals(FeeSubjectType.YE_SHEN_FANG_FEI.getKey())){
|
|
|
+ throw new JeecgBootException("房费和押金不能进行退单操作");
|
|
|
+ }
|
|
|
+
|
|
|
+ if(fee.getPreferentialStatus().equals(2)) {
|
|
|
+ BusOrderFee settleFee = new BusOrderFee();
|
|
|
+ settleFee.setPreferentialStatus(2);
|
|
|
+ settleFee.setReturnFeeId(fee.getId());
|
|
|
+ settleFee.setMoney(fee.getMoney().multiply(new BigDecimal(-1)));
|
|
|
+ settleFee.setFeeType(2); // 收款
|
|
|
+ settleFee.setCustorerOrderRemark("退单结账");
|
|
|
+ settleFee.setAllowCouponscash(false);
|
|
|
+ settleFee.setSubjectType(FeeSubjectType.TUI_DAN_JIE_ZHANG_SHOU_KUAN.getKey());
|
|
|
+ settleFee.setHotelId(fee.getHotelId());
|
|
|
+ settleFee.setCreateTime(new Date());
|
|
|
+ settleFee.setPayTime(new Date());
|
|
|
+ settleFee.setPreferentialStatus(2);
|
|
|
+ feeService.save(settleFee);
|
|
|
+ }
|
|
|
+ fee.setReturnItem(true);
|
|
|
+ fee.setPreferentialStatus(2);
|
|
|
+ feeService.updateById(fee);
|
|
|
+ }
|
|
|
+
|
|
|
}
|