jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
5c58d612 1 parent 10442c80

fix

Inline Side-by-side
Showing 2 changed files with 4 additions and 5 deletions
......@@ -53,7 +53,6 @@ public class PayController {
return payServiceClient.callback(paymentCallbackDTO);
}
@SaIgnore
@ApiOperation(value = "支付撤销")
@PostMapping(value = "/pay/cancel")
@ResponseStatus(HttpStatus.OK)
......
......@@ -462,8 +462,8 @@ public class OrderServiceImpl implements OrderService {
final var result = Arrays.stream(keywords)
.filter(keyword -> r.getCustomerNoticeJson().getDoctorsList().stream().anyMatch(str -> str.contains(keyword)))
.findFirst();
if (result != null) {
orderNotice.add("医嘱包含" + result);
if (result.isPresent()) {
orderNotice.add("医嘱包含" + result.get());
}
return OrderDto.builder()
.id(r.getId())
......@@ -541,8 +541,8 @@ public class OrderServiceImpl implements OrderService {
final var result = Arrays.stream(keywords)
.filter(keyword -> r.getCustomerNoticeJson().getDoctorsList().stream().anyMatch(str -> str.contains(keyword)))
.findFirst();
if (result != null) {
orderNotice.add("医嘱包含" + result);
if (result.isPresent()) {
orderNotice.add("医嘱包含" + result.get());
}
return OrderDto.builder()
.id(r.getId())
......