|
|
@@ -2514,9 +2514,10 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public CommonResult cancelApplet(CancelAppletDto cancelAppletDto) {
|
|
|
+ public CommonResult cancelApplet(CancelAppletDto cancelAppletDto,HttpServletRequest request) {
|
|
|
String houseNumberId = cancelAppletDto.getHouseNumberId();
|
|
|
String orderNumber = cancelAppletDto.getOrderNumber();
|
|
|
+ String ua = request.getHeader("User-Agent");
|
|
|
int usersId = cancelAppletDto.getUsersId();
|
|
|
|
|
|
if (ObjectUtils.isEmpty(houseNumberId) && ObjectUtils.isEmpty(orderNumber) && ObjectUtils.isEmpty(usersId) && usersId > 0) {
|
|
|
@@ -2560,7 +2561,7 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
String reserveLiveTime = houseOrder.getReserveLiveTime();
|
|
|
LocalDateTime date = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
|
|
|
- if (now.isAfter(date)) {
|
|
|
+ if (now.isAfter(date)&&HttpUtils.checkAgentIsMobile(ua)) {
|
|
|
return CommonResult.fail("已超过退款时间,如需退款请前往前台办理");
|
|
|
}
|
|
|
|