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 { ...@@ -53,7 +53,6 @@ public class PayController {
53 return payServiceClient.callback(paymentCallbackDTO); 53 return payServiceClient.callback(paymentCallbackDTO);
54 } 54 }
55 55
56 - @SaIgnore
57 @ApiOperation(value = "支付撤销") 56 @ApiOperation(value = "支付撤销")
58 @PostMapping(value = "/pay/cancel") 57 @PostMapping(value = "/pay/cancel")
59 @ResponseStatus(HttpStatus.OK) 58 @ResponseStatus(HttpStatus.OK)
......
...@@ -462,8 +462,8 @@ public class OrderServiceImpl implements OrderService { ...@@ -462,8 +462,8 @@ public class OrderServiceImpl implements OrderService {
462 final var result = Arrays.stream(keywords) 462 final var result = Arrays.stream(keywords)
463 .filter(keyword -> r.getCustomerNoticeJson().getDoctorsList().stream().anyMatch(str -> str.contains(keyword))) 463 .filter(keyword -> r.getCustomerNoticeJson().getDoctorsList().stream().anyMatch(str -> str.contains(keyword)))
464 .findFirst(); 464 .findFirst();
465 - if (result != null) { 465 + if (result.isPresent()) {
466 - orderNotice.add("医嘱包含" + result); 466 + orderNotice.add("医嘱包含" + result.get());
467 } 467 }
468 return OrderDto.builder() 468 return OrderDto.builder()
469 .id(r.getId()) 469 .id(r.getId())
...@@ -541,8 +541,8 @@ public class OrderServiceImpl implements OrderService { ...@@ -541,8 +541,8 @@ public class OrderServiceImpl implements OrderService {
541 final var result = Arrays.stream(keywords) 541 final var result = Arrays.stream(keywords)
542 .filter(keyword -> r.getCustomerNoticeJson().getDoctorsList().stream().anyMatch(str -> str.contains(keyword))) 542 .filter(keyword -> r.getCustomerNoticeJson().getDoctorsList().stream().anyMatch(str -> str.contains(keyword)))
543 .findFirst(); 543 .findFirst();
544 - if (result != null) { 544 + if (result.isPresent()) {
545 - orderNotice.add("医嘱包含" + result); 545 + orderNotice.add("医嘱包含" + result.get());
546 } 546 }
547 return OrderDto.builder() 547 return OrderDto.builder()
548 .id(r.getId()) 548 .id(r.getId())
......