1/26
This commit is contained in:
@@ -23,6 +23,7 @@ import java.time.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author wangpengfei
|
||||
@@ -100,6 +101,7 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
|
||||
String nextYear = DateUtil.offsetMonth(new Date(), 12).toString();
|
||||
int y = DateUtil.year(DateUtil.parse(nextYear));
|
||||
weekMap.add(String.valueOf(y) + "-01-01");
|
||||
weekMap=weekMap.stream().filter(e->!e.equals("2024-01-28")).collect(Collectors.toList());
|
||||
Object[] array = weekMap.stream().sorted().toArray();
|
||||
return rb.success().setData(array);
|
||||
}
|
||||
|
||||
@@ -27,13 +27,18 @@ public class EmpReserveOrderRest {
|
||||
@ApiOperation("预约提交")
|
||||
@PostMapping("/submission")
|
||||
public ResultBean submission(@RequestBody LpkReserveOrderDto dto) {
|
||||
return empReserveOrderService.submission(dto);
|
||||
ResultBean resultBean=new ResultBean<>().fail();
|
||||
return resultBean.setMsg("请求异常");
|
||||
// return empReserveOrderService.submission(dto);
|
||||
|
||||
}
|
||||
|
||||
@ApiOperation("企业卡预约提交")
|
||||
@PostMapping("/submissionEmp")
|
||||
public ResultBean submissionEmp(@RequestBody LpkReserveOrderDto dto) {
|
||||
return empReserveOrderService.submissionEmp(dto);
|
||||
ResultBean resultBean=new ResultBean<>().fail();
|
||||
return resultBean.setMsg("请求异常");
|
||||
// return empReserveOrderService.submissionEmp(dto);
|
||||
}
|
||||
@ApiOperation("订单列表")
|
||||
@PostMapping("/orderList")
|
||||
|
||||
@@ -27,7 +27,9 @@ public class LpkReserveOrderRest {
|
||||
@ApiOperation("预约提交")
|
||||
@PostMapping("/submission")
|
||||
public ResultBean submission(@RequestBody LpkReserveOrderDto dto) {
|
||||
return lpkReserveOrderService.submission(dto);
|
||||
ResultBean resultBean=new ResultBean<>().fail();
|
||||
return resultBean.setMsg("请求异常");
|
||||
// return lpkReserveOrderService.submission(dto);
|
||||
}
|
||||
|
||||
@ApiOperation("订单列表")
|
||||
|
||||
Reference in New Issue
Block a user