|
|
@@ -33,6 +33,7 @@ import org.jeecg.modules.business.dto.BookingOrderSaveDto;
|
|
|
import org.jeecg.modules.business.entity.*;
|
|
|
import org.jeecg.modules.business.enums.CheckInTypeEnum;
|
|
|
import org.jeecg.modules.business.service.*;
|
|
|
+import org.jeecg.modules.business.service.impl.BusMarketMemberServiceImpl;
|
|
|
import org.jeecg.modules.business.service.impl.BusRoomPayTypeServiceImpl;
|
|
|
import org.jeecg.modules.business.vo.KeLiItemVo;
|
|
|
import org.jeecg.modules.mall.entity.MallHotelOrder;
|
|
|
@@ -120,6 +121,8 @@ public class HotelController extends WebConfig {
|
|
|
private BusRoomPayTypeServiceImpl busRoomPayTypeService;
|
|
|
@Resource
|
|
|
private IBusLivingCustomerService busLivingCustomerService;
|
|
|
+ @Resource
|
|
|
+ private IBusMarketMemberService busMarketMemberService;
|
|
|
/**
|
|
|
* 酒店列表查询
|
|
|
*
|
|
|
@@ -769,6 +772,7 @@ public class HotelController extends WebConfig {
|
|
|
lambdaQueryWrapper.eq(BusMemberCard::getUserId, userId);
|
|
|
lambdaQueryWrapper.eq(BusMemberCard::getHotelId, memberCard.getHotelId()).last("limit 1");
|
|
|
BusMemberCard busMemberCard = busMemberCardService.getOne(lambdaQueryWrapper);
|
|
|
+ busMemberCard.setMarketMember(busMarketMemberService.getById(busMemberCard.getGradeId()));
|
|
|
return Result.ok(busMemberCard);
|
|
|
}
|
|
|
|