From 1c66b70f43c4b36b5213a6c5104afb8deb1a03f2 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 16 Mar 2023 17:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/service/OrderService.java     | 16 +------
 .../pile/OrderBasicInfoController.java        |  3 +-
 .../pile/service/IOrderBasicInfoService.java  |  8 ++++
 .../impl/OrderBasicInfoServiceImpl.java       | 46 +++++++++++--------
 .../pile/vo/web/OrderDetailInfoVO.java        |  1 +
 .../src/views/order/order/orderDetail.vue     | 28 +----------
 6 files changed, 40 insertions(+), 62 deletions(-)

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 4f6de9e4e..aff90c576 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -14,7 +14,6 @@ import com.jsowell.common.enums.MemberWalletEnum;
 import com.jsowell.common.enums.ykc.ActionTypeEnum;
 import com.jsowell.common.enums.ykc.OrderPayModeEnum;
 import com.jsowell.common.enums.ykc.OrderPayRecordEnum;
-import com.jsowell.common.enums.ykc.OrderPayStatusEnum;
 import com.jsowell.common.enums.ykc.OrderStatusEnum;
 import com.jsowell.common.enums.ykc.PayModeEnum;
 import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum;
@@ -727,20 +726,7 @@ public class OrderService {
 		vo.setPayAmount(String.valueOf(orderBasicInfo.getPayAmount()));
 
 		// 订单状态描述
-		String orderStatusDescribe;
-		if (StringUtils.equals(orderStatus, OrderStatusEnum.NOT_START.getValue())) {
-			// 未启动还有两种情况 待支付 / 支付成功
-			String payStatus = orderBasicInfo.getPayStatus();
-			if (StringUtils.equals(payStatus, OrderPayStatusEnum.paid.getValue())) {
-				// 支付成功，未启动
-				orderStatusDescribe = OrderPayStatusEnum.paid.getLabel() + ", " + OrderStatusEnum.getOrderStatus(orderStatus);
-			} else {
-				// 待支付
-				orderStatusDescribe = OrderPayStatusEnum.unpaid.getLabel();
-			}
-		} else {
-			orderStatusDescribe = OrderStatusEnum.getOrderStatus(orderStatus);
-		}
+		String orderStatusDescribe = orderBasicInfoService.transformOrderStatusDescribe(orderStatus, orderBasicInfo.getPayStatus());
 		vo.setOrderStatusDescribe(orderStatusDescribe);
 
 		// 获取充电桩枪口信息
diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
index 1084a6ffa..a9f2d8332 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
@@ -5,7 +5,6 @@ import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.core.domain.AjaxResult;
 import com.jsowell.common.core.page.TableDataInfo;
 import com.jsowell.common.enums.BusinessType;
-import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.poi.ExcelUtil;
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.dto.QueryOrderDTO;
@@ -74,7 +73,7 @@ public class OrderBasicInfoController extends BaseController {
 	}
 
 	/**
-	 * 获取订单详细信息
+	 * 获取订单详细信息 后管订单详情页
 	 * http://localhost:8080/order/orderDetail/88000000000001012211161342359448
 	 */
 	@PreAuthorize("@ss.hasPermi('order:order:query')")
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
index 1cd74ffd4..bd8a1c986 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
@@ -159,6 +159,14 @@ public interface IOrderBasicInfoService {
 	 */
 	void updateOrderStatusById(List<String> orderIds, String orderStatus);
 
+	/**
+	 * 通过订单状态和支付状态 转换订单状态描述
+	 * @param orderStatus 订单状态
+	 * @param payStatus 支付状态
+	 * @return 订单状态描述
+	 */
+	String transformOrderStatusDescribe(String orderStatus, String payStatus);
+
 	/**
 	 * 查询时间段内订单总金额和总用电量
 	 */
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 95432d6c4..4abad2bd6 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -179,29 +179,39 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 					orderListVO.setOutTradeNo(wxpayCallbackRecord.getOutTradeNo());
 				}
 				orderListVO.setPileConnectorCode(orderListVO.getPileSn() + orderListVO.getConnectorCode());
-
-				// 订单状态描述
-				String orderStatus = orderListVO.getOrderStatus(); // 订单状态
-				String payStatus = orderListVO.getPayStatus(); // 支付状态
-				String orderStatusDescribe;
-				if (StringUtils.equals(orderStatus, OrderStatusEnum.NOT_START.getValue())) {
-					// 未启动还有两种情况 待支付 / 支付成功
-					if (StringUtils.equals(payStatus, OrderPayStatusEnum.paid.getValue())) {
-						// 支付成功，未启动
-						orderStatusDescribe = OrderPayStatusEnum.paid.getLabel() + ", " + OrderStatusEnum.getOrderStatus(orderStatus);
-					} else {
-						// 待支付
-						orderStatusDescribe = OrderPayStatusEnum.unpaid.getLabel();
-					}
-				} else {
-					orderStatusDescribe = OrderStatusEnum.getOrderStatus(orderStatus);
-				}
-				orderListVO.setOrderStatusDescribe(orderStatusDescribe);
+				orderListVO.setOrderStatusDescribe(transformOrderStatusDescribe(orderListVO.getOrderStatus(), orderListVO.getPayStatus()));
 			}
 		}
 		return orderListVOS;
 	}
 
+	/**
+	 * 通过订单状态和支付状态 转换订单状态描述
+	 * @param orderStatus
+	 * @param payStatus
+	 * @return
+	 */
+	@Override
+	public String transformOrderStatusDescribe(String orderStatus, String payStatus) {
+		// 订单状态描述
+		// String orderStatus = orderListVO.getOrderStatus(); // 订单状态
+		// String payStatus = orderListVO.getPayStatus(); // 支付状态
+		String orderStatusDescribe;
+		if (StringUtils.equals(orderStatus, OrderStatusEnum.NOT_START.getValue())) {
+			// 未启动还有两种情况 待支付 / 支付成功
+			if (StringUtils.equals(payStatus, OrderPayStatusEnum.paid.getValue())) {
+				// 支付成功，未启动
+				orderStatusDescribe = OrderPayStatusEnum.paid.getLabel() + ", " + OrderStatusEnum.getOrderStatus(orderStatus);
+			} else {
+				// 待支付
+				orderStatusDescribe = OrderPayStatusEnum.unpaid.getLabel();
+			}
+		} else {
+			orderStatusDescribe = OrderStatusEnum.getOrderStatus(orderStatus);
+		}
+		return orderStatusDescribe;
+	}
+
 	/**
 	 * 查询时间段内订单总金额和总用电量
 	 *
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
index b26741e27..be73b7f0c 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
@@ -58,6 +58,7 @@ public class OrderDetailInfoVO {
 	public static class OrderInfo {
 		private String orderCode; // 订单编号
 		private String orderStatus; // 订单状态
+		private String orderStatusDescribe; // 订单状态描述
 		private String startTime; // 充电开始时间
 		private String endTime; // 充电结束时间
 		private String stopReasonMsg; // 停止原因
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 550840b76..52305cb54 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -54,11 +54,6 @@
             <span>{{ status(scope.row.orderStatus) }}</span>
           </template>
         </el-table-column>
-<!--        <el-table-column-->
-<!--          prop="orderAmount"-->
-<!--          label="订单金额"-->
-<!--          align="center"-->
-<!--        ></el-table-column>-->
         <el-table-column prop="createTime" label="创建时间" align="center"/>
         <el-table-column prop="startTime" label="开始时间" align="center"/>
         <el-table-column prop="endTime" label="结束时间" align="center"/>
@@ -121,8 +116,6 @@
       <div class="marginTop"></div>
     </el-card>
 
-
-
     <!--    支付信息-->
     <el-card class="cardStyle">
       <h3>支付信息</h3>
@@ -142,26 +135,6 @@
       <div class="marginTop"></div>
     </el-card>
 
-    <!--  -->
-    <!-- <el-card class="cardStyle">
-      <h3>消费信息</h3>
-      <el-table style="width: 100%" :data="payDetail" border>
-        <el-table-column prop="payAmount" label="支付金额" align="center"></el-table-column>
-        <el-table-column prop="payModeDesc" label="支付方式" align="center"></el-table-column>
-        <el-table-column prop="payStatus" label="支付状态" align="center">
-          <template slot-scope="scope">
-            <span>{{scope.row.payStatus === '1' ? '支付完成' :'待支付'}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="payTime" label="支付时间" align="center"></el-table-column>
-        <el-table-column prop="outTradeNo" label="商务单号" align="center">
-          <template slot-scope="scope">
-            <span>{{scope.row.outTradeNo === null ? '一' :scope.row.outTradeNo}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="marginTop"></div>
-    </el-card> -->
     <!--  设备信息  -->
     <el-card class="cardStyle">
       <h3>设备信息</h3>
@@ -174,6 +147,7 @@
       </el-table>
       <div class="marginTop"></div>
     </el-card>
+
     <!--  用户信息  -->
     <el-card class="cardStyle">
       <h3>用户信息</h3>