jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
53108e45 1 parent 5e68a5b5

fix refund

Expand all
Inline Side-by-side
Showing 11 changed files with 47 additions and 41 deletions
...@@ -36,10 +36,10 @@ public class ClientOrderController { ...@@ -36,10 +36,10 @@ public class ClientOrderController {
36 } 36 }
37 37
38 @ApiOperation(value = "院区端已撤销订单") 38 @ApiOperation(value = "院区端已撤销订单")
39 - @PostMapping("/client/orders/canceled/pagination") 39 + @PostMapping("/client/orders/refund/pagination")
40 @ResponseStatus(HttpStatus.OK) 40 @ResponseStatus(HttpStatus.OK)
41 - public OrderPageResult<OrderDto> getCanceledOrderByByPagination(@Valid @RequestBody OrderDbDTO.QueryCanceledOrderByPaginationDto queryOrderDto) { 41 + public OrderPageResult<OrderDto> getRefundOrderByByPagination(@Valid @RequestBody OrderDbDTO.QueryRefundOrderByPaginationDto queryOrderDto) {
42 - return orderService.getCanceledOrdersByPagination(queryOrderDto); 42 + return orderService.getRefundOrdersByPagination(queryOrderDto);
43 } 43 }
44 44
45 } 45 }
......
...@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor; ...@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
12 import lombok.extern.slf4j.Slf4j; 12 import lombok.extern.slf4j.Slf4j;
13 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.http.HttpStatus; 14 import org.springframework.http.HttpStatus;
15 +import org.springframework.http.MediaType;
15 import org.springframework.validation.annotation.Validated; 16 import org.springframework.validation.annotation.Validated;
16 import org.springframework.web.bind.annotation.PathVariable; 17 import org.springframework.web.bind.annotation.PathVariable;
17 import org.springframework.web.bind.annotation.PostMapping; 18 import org.springframework.web.bind.annotation.PostMapping;
...@@ -54,9 +55,9 @@ public class PayController { ...@@ -54,9 +55,9 @@ public class PayController {
54 } 55 }
55 56
56 @ApiOperation(value = "支付撤销") 57 @ApiOperation(value = "支付撤销")
57 - @PostMapping(value = "/pay/cancel") 58 + @PostMapping(value = "/pay/refund", produces = MediaType.TEXT_HTML_VALUE)
58 @ResponseStatus(HttpStatus.OK) 59 @ResponseStatus(HttpStatus.OK)
59 - public boolean cancel(@Valid @RequestBody PayDTO.PayCancelRequestDto payCancelRequestDto) { 60 + public String cancel(@Valid @RequestBody PayDTO.PayRefundRequestDto payRefundRequestDto) {
60 - return payServiceClient.cancelOrder(payCancelRequestDto); 61 + return payServiceClient.orderPayRefund(payRefundRequestDto);
61 } 62 }
62 } 63 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -36,7 +36,13 @@ public enum ErrorCodeEnum implements BaseEnum { ...@@ -36,7 +36,13 @@ public enum ErrorCodeEnum implements BaseEnum {
36 36
37 ORDER_CANCEL(406000009, "订单已自动取消"), 37 ORDER_CANCEL(406000009, "订单已自动取消"),
38 38
39 - ORDER_PAY_CANCEL_FAILED(406000010, "支付撤销失败") 39 + ORDER_PAY_REFUND_FAILED(406000010, "支付撤销失败"),
40 +
41 + ORDER_NOT_FOUND(406000011, "订单未找到"),
42 +
43 + ORDER_NOT_ONLINE_PAY(406000012, "该订单不是在线支付"),
44 +
45 + ORDER_NOT_SUCCESS(406000013, "该订单未支付成功")
40 ; 46 ;
41 private final int code; 47 private final int code;
42 48
......
...@@ -65,7 +65,7 @@ public class OrderDbDTO { ...@@ -65,7 +65,7 @@ public class OrderDbDTO {
65 65
66 @Data 66 @Data
67 @ApiModel(description = "查询已撤销订单Dto") 67 @ApiModel(description = "查询已撤销订单Dto")
68 - public static class QueryCanceledOrderByPaginationDto { 68 + public static class QueryRefundOrderByPaginationDto {
69 private Integer enterpriseId; 69 private Integer enterpriseId;
70 private Integer clientId; 70 private Integer clientId;
71 private Integer pn; 71 private Integer pn;
...@@ -406,7 +406,7 @@ public class OrderDbDTO { ...@@ -406,7 +406,7 @@ public class OrderDbDTO {
406 @ApiModelProperty(value = "支付时间") 406 @ApiModelProperty(value = "支付时间")
407 private String payTime; 407 private String payTime;
408 408
409 - @ApiModelProperty(value = "支付状态，1=待支付，2=支付中，3=支付成功，4=支付失败，5=支付取消") 409 + @ApiModelProperty(value = "支付状态，1=待支付，2=支付中，3=支付成功，4=支付失败，5=支付取消, 6=支付已撤销")
410 private Integer payStatus; 410 private Integer payStatus;
411 411
412 @ApiModelProperty(value = "支付失败原因") 412 @ApiModelProperty(value = "支付失败原因")
......
...@@ -26,14 +26,12 @@ public class PayDTO { ...@@ -26,14 +26,12 @@ public class PayDTO {
26 } 26 }
27 27
28 @Data 28 @Data
29 - @ApiModel(description = "支付请求dto") 29 + @ApiModel(description = "支付撤销请求dto")
30 @NoArgsConstructor 30 @NoArgsConstructor
31 @AllArgsConstructor 31 @AllArgsConstructor
32 - public static class PayCancelRequestDto { 32 + public static class PayRefundRequestDto {
33 -// private String clientId;
34 private Integer orderId; 33 private Integer orderId;
35 private String hospitalCode; 34 private String hospitalCode;
36 -// private String price;
37 } 35 }
38 36
39 @Data 37 @Data
......
...@@ -9,9 +9,9 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.OrderAndDetailsDto; ...@@ -9,9 +9,9 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.OrderAndDetailsDto;
9 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailBatchUpdateDto; 9 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailBatchUpdateDto;
10 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailDto; 10 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailDto;
11 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDto; 11 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDto;
12 -import com.infoloop.tianting.model.dto.OrderDbDTO.QueryCanceledOrderByPaginationDto;
13 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto; 12 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto;
14 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByPaginationDto; 13 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByPaginationDto;
14 +import com.infoloop.tianting.model.dto.OrderDbDTO.QueryRefundOrderByPaginationDto;
15 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderDto; 15 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderDto;
16 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderResponse; 16 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderResponse;
17 import com.infoloop.tianting.model.dto.OrderDbDTO.getMenuOrderCountDto; 17 import com.infoloop.tianting.model.dto.OrderDbDTO.getMenuOrderCountDto;
...@@ -22,8 +22,8 @@ public interface OrderService { ...@@ -22,8 +22,8 @@ public interface OrderService {
22 OrderAndDetailsDto getOrdersByCustomerId(Integer customerId); 22 OrderAndDetailsDto getOrdersByCustomerId(Integer customerId);
23 OrderAndDetailsDto getOrdersByCondition(QueryOrderByConditionDto queryOrderDto); 23 OrderAndDetailsDto getOrdersByCondition(QueryOrderByConditionDto queryOrderDto);
24 OrderPageResult<OrderDto> getOrdersByPagination(QueryOrderByPaginationDto queryOrderDto); 24 OrderPageResult<OrderDto> getOrdersByPagination(QueryOrderByPaginationDto queryOrderDto);
25 - OrderPageResult<OrderDto> getCanceledOrdersByPagination( 25 + OrderPageResult<OrderDto> getRefundOrdersByPagination(
26 - QueryCanceledOrderByPaginationDto queryOrderDto); 26 + QueryRefundOrderByPaginationDto queryOrderDto);
27 List<OrderDetailDto> getOrderDetailsByOrderId(Integer orderId); 27 List<OrderDetailDto> getOrderDetailsByOrderId(Integer orderId);
28 CreateOrderResponse createOrder(CreateOrderDto createOrderDto); 28 CreateOrderResponse createOrder(CreateOrderDto createOrderDto);
29 CreateOrderResponse orderCreation(OperatorCreateOrderDto createOrderDto); 29 CreateOrderResponse orderCreation(OperatorCreateOrderDto createOrderDto);
......
...@@ -64,9 +64,9 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.MealDetailDto; ...@@ -64,9 +64,9 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.MealDetailDto;
64 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailBatchUpdateDto; 64 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailBatchUpdateDto;
65 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailDto; 65 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailDto;
66 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailOperationDto; 66 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailOperationDto;
67 -import com.infoloop.tianting.model.dto.OrderDbDTO.QueryCanceledOrderByPaginationDto;
68 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto; 67 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto;
69 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByPaginationDto; 68 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByPaginationDto;
69 +import com.infoloop.tianting.model.dto.OrderDbDTO.QueryRefundOrderByPaginationDto;
70 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderDto; 70 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderDto;
71 import com.infoloop.tianting.server.UserAuthData; 71 import com.infoloop.tianting.server.UserAuthData;
72 import com.infoloop.tianting.server.WebSocketServer; 72 import com.infoloop.tianting.server.WebSocketServer;
...@@ -463,7 +463,7 @@ public class OrderServiceRpcClient { ...@@ -463,7 +463,7 @@ public class OrderServiceRpcClient {
463 .setPageNo(queryOrderDto.getPn()) 463 .setPageNo(queryOrderDto.getPn())
464 .setPageSize(queryOrderDto.getPz()) 464 .setPageSize(queryOrderDto.getPz())
465 .setShouldFilterStatus(true) 465 .setShouldFilterStatus(true)
466 - .setShouldFilterIsCanceled(false) 466 + .setShouldFilterPayStatus(false)
467 .setStatus(queryOrderDto.getStatus()) 467 .setStatus(queryOrderDto.getStatus())
468 .setEnterpriseId(queryOrderDto.getEnterpriseId()) 468 .setEnterpriseId(queryOrderDto.getEnterpriseId())
469 .setClientId(queryOrderDto.getClientId()) 469 .setClientId(queryOrderDto.getClientId())
...@@ -472,15 +472,15 @@ public class OrderServiceRpcClient { ...@@ -472,15 +472,15 @@ public class OrderServiceRpcClient {
472 return orderServiceRpcBlockingStub.queryClientCustomerOrdersByPagination(request); 472 return orderServiceRpcBlockingStub.queryClientCustomerOrdersByPagination(request);
473 } 473 }
474 474
475 - public QueryClientCustomerOrdersByPaginationRpcResponse queryCanceledClientCustomerOrdersByPagination( 475 + public QueryClientCustomerOrdersByPaginationRpcResponse queryRefundClientCustomerOrdersByPagination(
476 - QueryCanceledOrderByPaginationDto queryOrderDto) { 476 + QueryRefundOrderByPaginationDto queryOrderDto) {
477 final var request = QueryClientCustomerOrdersByPaginationRpcRequest.newBuilder() 477 final var request = QueryClientCustomerOrdersByPaginationRpcRequest.newBuilder()
478 .setKeyword(queryOrderDto.getKeyword() == null ? "" : queryOrderDto.getKeyword()) 478 .setKeyword(queryOrderDto.getKeyword() == null ? "" : queryOrderDto.getKeyword())
479 .setPageNo(queryOrderDto.getPn()) 479 .setPageNo(queryOrderDto.getPn())
480 .setPageSize(queryOrderDto.getPz()) 480 .setPageSize(queryOrderDto.getPz())
481 .setShouldFilterStatus(false) 481 .setShouldFilterStatus(false)
482 - .setShouldFilterIsCanceled(true) 482 + .setShouldFilterPayStatus(true)
483 - .setIsCanceled(true) 483 + .setPayStatus(PayStatusEnum.REFUND)
484 .setEnterpriseId(queryOrderDto.getEnterpriseId()) 484 .setEnterpriseId(queryOrderDto.getEnterpriseId())
485 .setClientId(queryOrderDto.getClientId()) 485 .setClientId(queryOrderDto.getClientId())
486 .addAllStallIds(queryOrderDto.getStallIds()) 486 .addAllStallIds(queryOrderDto.getStallIds())
......
...@@ -36,9 +36,9 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.OrderCountByStatusDto; ...@@ -36,9 +36,9 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.OrderCountByStatusDto;
36 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailBatchUpdateDto; 36 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailBatchUpdateDto;
37 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailDto; 37 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailDto;
38 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDto; 38 import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDto;
39 -import com.infoloop.tianting.model.dto.OrderDbDTO.QueryCanceledOrderByPaginationDto;
40 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto; 39 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto;
41 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByPaginationDto; 40 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByPaginationDto;
41 +import com.infoloop.tianting.model.dto.OrderDbDTO.QueryRefundOrderByPaginationDto;
42 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderDto; 42 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderDto;
43 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderResponse; 43 import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderResponse;
44 import com.infoloop.tianting.model.dto.OrderDbDTO.getMenuOrderCountDto; 44 import com.infoloop.tianting.model.dto.OrderDbDTO.getMenuOrderCountDto;
...@@ -515,9 +515,9 @@ public class OrderServiceImpl implements OrderService { ...@@ -515,9 +515,9 @@ public class OrderServiceImpl implements OrderService {
515 } 515 }
516 516
517 @Override 517 @Override
518 - public OrderPageResult<OrderDto> getCanceledOrdersByPagination( 518 + public OrderPageResult<OrderDto> getRefundOrdersByPagination(
519 - QueryCanceledOrderByPaginationDto queryOrderDto) { 519 + QueryRefundOrderByPaginationDto queryOrderDto) {
520 - final var response = orderServiceRpcClient.queryCanceledClientCustomerOrdersByPagination(queryOrderDto); 520 + final var response = orderServiceRpcClient.queryRefundClientCustomerOrdersByPagination(queryOrderDto);
521 final var customerIds = response.getResponsesList().stream().map(SingleClientCustomerOrderRpcResponse::getCustomerId).collect(Collectors.toList()); 521 final var customerIds = response.getResponsesList().stream().map(SingleClientCustomerOrderRpcResponse::getCustomerId).collect(Collectors.toList());
522 final var customerResponse = clientCustomerServiceRpcClient.getClientCustomersByIds( 522 final var customerResponse = clientCustomerServiceRpcClient.getClientCustomersByIds(
523 queryOrderDto.getEnterpriseId(), customerIds); 523 queryOrderDto.getEnterpriseId(), customerIds);
......
...@@ -74,6 +74,7 @@ enum PayStatusEnum { ...@@ -74,6 +74,7 @@ enum PayStatusEnum {
74 SUCCEED = 3; 74 SUCCEED = 3;
75 FAILED = 4; 75 FAILED = 4;
76 PAY_CANCELED = 5; 76 PAY_CANCELED = 5;
77 + REFUND = 6;
77 } 78 }
78 79
79 enum CloseTimeType { 80 enum CloseTimeType {
...@@ -181,8 +182,8 @@ message QueryClientCustomerOrdersByPaginationRpcRequest { ...@@ -181,8 +182,8 @@ message QueryClientCustomerOrdersByPaginationRpcRequest {
181 int32 pageNo = 6; 182 int32 pageNo = 6;
182 int32 pageSize = 7; 183 int32 pageSize = 7;
183 repeated int32 stallIds = 8; 184 repeated int32 stallIds = 8;
184 - bool shouldFilterIsCanceled = 9; 185 + bool shouldFilterPayStatus = 9;
185 - bool isCanceled = 10; 186 + PayStatusEnum payStatus = 10;
186 } 187 }
187 188
188 message OrderCountByStatus { 189 message OrderCountByStatus {
......
...@@ -34,43 +34,43 @@ okhttp.max-idle-connections=10 ...@@ -34,43 +34,43 @@ okhttp.max-idle-connections=10
34 okhttp.keep-alive-duration=300 34 okhttp.keep-alive-duration=300
35 35
36 ##GRPC\u914D\u7F6E 36 ##GRPC\u914D\u7F6E
37 -grpc.order-service.url=localhost 37 +grpc.order-service.url=115.190.92.112
38 -grpc.order-service.port=4096 38 +grpc.order-service.port=4065
39 39
40 -grpc.menu-service.url=47.101.193.136 40 +grpc.menu-service.url=115.190.92.112
41 grpc.menu-service.port=3017 41 grpc.menu-service.port=3017
42 42
43 -grpc.sku-service.url=47.101.193.136 43 +grpc.sku-service.url=115.190.92.112
44 grpc.sku-service.port=3027 44 grpc.sku-service.port=3027
45 45
46 -grpc.category-service.url=47.101.193.136 46 +grpc.category-service.url=115.190.92.112
47 grpc.category-service.port=3027 47 grpc.category-service.port=3027
48 48
49 -grpc.client-customer-service.url=47.101.193.136 49 +grpc.client-customer-service.url=115.190.92.112
50 grpc.client-customer-service.port=3031 50 grpc.client-customer-service.port=3031
51 51
52 -grpc.client-inventory-service.url=47.101.193.136 52 +grpc.client-inventory-service.url=115.190.92.112
53 grpc.client-inventory-service.port=3037 53 grpc.client-inventory-service.port=3037
54 54
55 -grpc.meal-service.url=47.101.193.136 55 +grpc.meal-service.url=115.190.92.112
56 grpc.meal-service.port=3017 56 grpc.meal-service.port=3017
57 57
58 -grpc.delivery-service.url=47.101.193.136 58 +grpc.delivery-service.url=115.190.92.112
59 grpc.delivery-service.port=3017 59 grpc.delivery-service.port=3017
60 60
61 grpc.operator-service.url=115.190.92.112 61 grpc.operator-service.url=115.190.92.112
62 grpc.operator-service.port=3031 62 grpc.operator-service.port=3031
63 63
64 -grpc.woperator-service.url=47.101.193.136 64 +grpc.woperator-service.url=115.190.92.112
65 grpc.woperator-service.port=3028 65 grpc.woperator-service.port=3028
66 66
67 -grpc.enterprise-resource-service.url=47.101.193.136 67 +grpc.enterprise-resource-service.url=115.190.92.112
68 grpc.enterprise-resource-service.port=3026 68 grpc.enterprise-resource-service.port=3026
69 69
70 -grpc.client-resource-service.url=47.101.193.136 70 +grpc.client-resource-service.url=115.190.92.112
71 grpc.client-resource-service.port=3019 71 grpc.client-resource-service.port=3019
72 72
73 -grpc.meizhongyihe-service.url=47.101.193.136 73 +grpc.meizhongyihe-service.url=115.190.92.112
74 grpc.meizhongyihe-service.port=3040 74 grpc.meizhongyihe-service.port=3040
75 75
76 miniprogram.appId=wx40ec496d73b58ec6 76 miniprogram.appId=wx40ec496d73b58ec6
......