Browse Source

1/26

master
wangpengfei 1 year ago
parent
commit
479cdba742
  1. 2
      src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java
  2. 9
      src/main/java/com/yxt/yythmall/biz/empreserveorder/EmpReserveOrderRest.java
  3. 4
      src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderRest.java

2
src/main/java/com/yxt/yythmall/biz/customerstore/CustomerStoreService.java

@ -23,6 +23,7 @@ import java.time.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* @author wangpengfei * @author wangpengfei
@ -100,6 +101,7 @@ public class CustomerStoreService extends MybatisBaseService<CustomerStoreMapper
String nextYear = DateUtil.offsetMonth(new Date(), 12).toString(); String nextYear = DateUtil.offsetMonth(new Date(), 12).toString();
int y = DateUtil.year(DateUtil.parse(nextYear)); int y = DateUtil.year(DateUtil.parse(nextYear));
weekMap.add(String.valueOf(y) + "-01-01"); 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(); Object[] array = weekMap.stream().sorted().toArray();
return rb.success().setData(array); return rb.success().setData(array);
} }

9
src/main/java/com/yxt/yythmall/biz/empreserveorder/EmpReserveOrderRest.java

@ -27,13 +27,18 @@ public class EmpReserveOrderRest {
@ApiOperation("预约提交") @ApiOperation("预约提交")
@PostMapping("/submission") @PostMapping("/submission")
public ResultBean submission(@RequestBody LpkReserveOrderDto dto) { public ResultBean submission(@RequestBody LpkReserveOrderDto dto) {
return empReserveOrderService.submission(dto); ResultBean resultBean=new ResultBean<>().fail();
return resultBean.setMsg("请求异常");
// return empReserveOrderService.submission(dto);
} }
@ApiOperation("企业卡预约提交") @ApiOperation("企业卡预约提交")
@PostMapping("/submissionEmp") @PostMapping("/submissionEmp")
public ResultBean submissionEmp(@RequestBody LpkReserveOrderDto dto) { public ResultBean submissionEmp(@RequestBody LpkReserveOrderDto dto) {
return empReserveOrderService.submissionEmp(dto); ResultBean resultBean=new ResultBean<>().fail();
return resultBean.setMsg("请求异常");
// return empReserveOrderService.submissionEmp(dto);
} }
@ApiOperation("订单列表") @ApiOperation("订单列表")
@PostMapping("/orderList") @PostMapping("/orderList")

4
src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderRest.java

@ -27,7 +27,9 @@ public class LpkReserveOrderRest {
@ApiOperation("预约提交") @ApiOperation("预约提交")
@PostMapping("/submission") @PostMapping("/submission")
public ResultBean submission(@RequestBody LpkReserveOrderDto dto) { public ResultBean submission(@RequestBody LpkReserveOrderDto dto) {
return lpkReserveOrderService.submission(dto); ResultBean resultBean=new ResultBean<>().fail();
return resultBean.setMsg("请求异常");
// return lpkReserveOrderService.submission(dto);
} }
@ApiOperation("订单列表") @ApiOperation("订单列表")

Loading…
Cancel
Save