From d62995cd53874914a35889364567ca6c51a92f32 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 12 Jul 2023 15:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/api/uniapp/OrderController.java   | 38 +++++++++++++++----
 .../com/jsowell/service/OrderService.java     |  9 +++++
 .../pile/vo/uniapp/UniAppOrderDetailVO.java   | 15 ++++++++
 3 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderDetailVO.java

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java
index 0a72e8fb9..154920eba 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java
@@ -10,15 +10,10 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
-import com.jsowell.pile.dto.ApplyOrderInvoiceDTO;
-import com.jsowell.pile.dto.GenerateOrderDTO;
-import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
-import com.jsowell.pile.dto.QueryOrderDTO;
-import com.jsowell.pile.dto.SettleOrderDTO;
-import com.jsowell.pile.dto.StopChargingDTO;
-import com.jsowell.pile.dto.UniAppQueryOrderDTO;
+import com.jsowell.pile.dto.*;
 import com.jsowell.pile.vo.base.StationInfoVO;
 import com.jsowell.pile.vo.uniapp.OrderVO;
+import com.jsowell.pile.vo.uniapp.UniAppOrderDetailVO;
 import com.jsowell.pile.vo.uniapp.UniAppOrderVO;
 import com.jsowell.service.OrderService;
 import com.jsowell.wxpay.dto.WechatSendMsgDTO;
@@ -183,6 +178,35 @@ public class OrderController extends BaseController {
 		return response;
 	}
 
+	/**
+	 * 小程序获取订单详情V2
+	 * http://localhost:8080/uniapp/order/getOrderDetail
+	 * @param request
+	 * @param dto
+	 * @return
+	 */
+	@PostMapping("/getOrderDetailV2")
+	public RestApiResponse<?> getOrderDetailV2(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
+		logger.info("小程序获取订单详情V2 param:{}", JSONObject.toJSONString(dto));
+		RestApiResponse<?> response = null;
+		try {
+			String memberId = getMemberIdByAuthorization(request);
+			if (StringUtils.isBlank(memberId)) {
+				throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
+			}
+			UniAppOrderDetailVO uniAppOrderDetail = orderService.getUniAppOrderDetailV2(dto.getOrderCode());
+			response = new RestApiResponse<>(uniAppOrderDetail);
+		} catch (BusinessException e) {
+			logger.warn("小程序获取订单详情V2 warn", e);
+			response = new RestApiResponse<>(e.getCode(), e.getMessage());
+		} catch (Exception e) {
+			logger.error("小程序获取订单详情V2 error", e);
+			response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_DETAIL_ERROR);
+		}
+		logger.info("小程序获取订单详情V2, result:{}", JSONObject.toJSONString(response));
+		return response;
+	}
+
 	/**
 	 * 根据订单号查询充电桩启动状态
 	 * http://localhost:8080/uniapp/order/selectPileStarterStatus
diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 2601549df..b76a728c2 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -1041,6 +1041,14 @@ public class OrderService {
 		return vo;
 	}
 
+	public UniAppOrderDetailVO getUniAppOrderDetailV2(String orderCode) {
+		UniAppOrderDetailVO resultVO = new UniAppOrderDetailVO();
+
+
+
+		return resultVO;
+	}
+
 	/**
 	 * 根据订单号查询充电桩启动状态
 	 * @param orderCode
@@ -1450,4 +1458,5 @@ public class OrderService {
 
 	}
 
+
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderDetailVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderDetailVO.java
new file mode 100644
index 000000000..246ee66a6
--- /dev/null
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderDetailVO.java
@@ -0,0 +1,15 @@
+package com.jsowell.pile.vo.uniapp;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UniAppOrderDetailVO {
+
+
+}