diff --git a/src/main/java/com/imyeyu/api/modules/gao/controller/GaoSalesOrderController.java b/src/main/java/com/imyeyu/api/modules/gao/controller/GaoSalesOrderController.java index 0caf16e..07222c5 100644 --- a/src/main/java/com/imyeyu/api/modules/gao/controller/GaoSalesOrderController.java +++ b/src/main/java/com/imyeyu/api/modules/gao/controller/GaoSalesOrderController.java @@ -1,8 +1,8 @@ package com.imyeyu.api.modules.gao.controller; +import com.imyeyu.api.bean.PermissionMatchMode; import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission; import com.imyeyu.api.modules.gao.bean.GaoPermissionCode; -import com.imyeyu.api.bean.PermissionMatchMode; import com.imyeyu.api.modules.gao.entity.GaoFundRecord; import com.imyeyu.api.modules.gao.entity.GaoSalesOrder; import com.imyeyu.api.modules.gao.service.GaoOrderPaymentService; @@ -17,6 +17,8 @@ import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentRevokeRequest; import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest; import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage; import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest; +import com.imyeyu.api.modules.user.service.UserService; +import com.imyeyu.java.TimiJava; import com.imyeyu.java.bean.timi.TimiException; import com.imyeyu.spring.annotation.AOPLog; import com.imyeyu.spring.annotation.RequestRateLimit; @@ -40,6 +42,7 @@ public class GaoSalesOrderController { private final GaoSalesOrderService service; private final GaoOrderPaymentService paymentService; private final GaoStoreScopeService storeScopeService; + private final UserService userService; @AOPLog @RequestRateLimit @@ -56,7 +59,11 @@ public class GaoSalesOrderController { @RequireGaoPermission(GaoPermissionCode.SALES_ORDER_READ) @PostMapping("/detail") public GaoSalesOrder detail(@RequestParam String id) { - return service.detail(id); + GaoSalesOrder result = service.detail(id); + if (TimiJava.isNotEmpty(result.getCancelOperatorUserId())) { + result.setCancelOperator(userService.get(result.getCancelOperatorUserId())); + } + return result; } @AOPLog