From 76662d5a67ed29b018aea2964bad30dec12e38a8 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 25 Oct 2024 14:06:17 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E8=BF=90=E8=90=A5=E7=AB=AF?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9dd18c9ffb7e5b847b5fe462aaca361316b9dd32) --- .../uniapp/business/BusinessOrderController.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessOrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessOrderController.java index fb9bdd108..ee24d5ea9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessOrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessOrderController.java @@ -5,12 +5,14 @@ import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.vo.uniapp.business.BusinessConnectorInfoVO; +import com.jsowell.pile.vo.uniapp.business.BusinessOrderBillingInfoVO; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.xml.ws.soap.Addressing; +import java.util.List; /** * 运营端小程序订单Controller @@ -51,6 +53,15 @@ public class BusinessOrderController extends BaseController { */ @GetMapping("/getOrderBillingDetail/{orderCode}") public RestApiResponse getOrderBillingDetail(@PathVariable("orderCode") String orderCode) { - orderBasicInfoService.getOrderBillingDetail(orderCode); + RestApiResponse response = null; + try { + List orderBillingDetail = orderBasicInfoService.getOrderBillingDetail(orderCode); + response = new RestApiResponse<>(ImmutableMap.of("BusinessOrderBillingInfoList", orderBillingDetail)); + } catch (Exception e) { + logger.error("通过订单编号查询订单各时段计费明细 error", e); + response = new RestApiResponse<>(e); + } + logger.info("通过订单编号查询订单各时段计费明细 orderCode:{}, result:{}", orderCode, response); + return response; } }