From 3aaabbbdfc9b3a939e80ad834c6ee9cf73dfebe4 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Sat, 8 Jul 2023 15:37:53 +0800
Subject: [PATCH] update

---
 .../test/java/SpringBootTestController.java   |  11 ++
 .../com/jsowell/pile/vo/web/OrderListVO.java  |   1 +
 jsowell-ui/src/views/order/order/index.vue    | 131 +++++++++++-------
 3 files changed, 93 insertions(+), 50 deletions(-)

diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java
index 8f0945944..781a48719 100644
--- a/jsowell-admin/src/test/java/SpringBootTestController.java
+++ b/jsowell-admin/src/test/java/SpringBootTestController.java
@@ -173,12 +173,23 @@ public class SpringBootTestController {
 	@Autowired
 	private AMapService aMapService;
 
+	@Autowired
+	private IPileConnectorInfoService pileConnectorInfoService;
+
 	@Autowired
 	private TransactionRecordsRequestHandler transactionRecordsRequestHandler;
 
 	@Autowired
 	private IMemberBasicInfoService memberBasicInfoService;
 
+
+	@Test
+	public void testUpdateConnectorStatus() {
+		String pileConnectorCode = "8800000000000101";
+		String status = PileConnectorStatusEnum.FREE.getValue();
+		pileConnectorInfoService.updateConnectorStatus(pileConnectorCode, status);
+	}
+
 	@Test
 	public void testOrder() throws Exception {
 		// 通过vin码查询数据库绑定用户信息
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java
index 12204ed6f..d95363bb6 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java
@@ -30,6 +30,7 @@ public class OrderListVO {
     /**
      * 交易流水号
      */
+    @Excel(name = "交易流水号")
     private String transactionCode;
 
     /**
diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index 036597d26..1b7f2ef8f 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -96,7 +96,7 @@
                     margin-bottom: 15px;
                 "
                 :icon="icon"
-                >{{ showOrHideText }}
+            >{{ showOrHideText }}
             </el-button>
         </el-form>
 
@@ -107,7 +107,8 @@
                     icon="el-icon-search"
                     size="mini"
                     @click="handleQuery"
-                    >搜索</el-button
+                >搜索
+                </el-button
                 >
             </el-col>
             <el-col :span="1.5">
@@ -115,7 +116,8 @@
                     icon="el-icon-refresh"
                     size="mini"
                     @click="resetQuery"
-                    >重置</el-button
+                >重置
+                </el-button
                 >
             </el-col>
             <el-button
@@ -125,17 +127,21 @@
                 size="mini"
                 @click="handleExport"
                 v-hasPermi="['order:order:export']"
-                >导出</el-button
+            >导出
+            </el-button
             >
             <div>
-                {{ dateDescription }}期间，总用电量{{sumUsedElectricity}}度，总消费金额{{ sumOrderAmount }}元，总结算金额{{sumSettleAmount}}元
+                {{ dateDescription }}期间，总用电量{{ sumUsedElectricity }}度，总消费金额{{
+                    sumOrderAmount
+                }}元，总结算金额{{ sumSettleAmount }}元
             </div>
             <el-popover placement="top-start" width="400" trigger="click">
                 <el-checkbox
                     :indeterminate="isIndeterminate"
                     v-model="checkAll"
                     @change="handleCheckAllChange"
-                    >全选</el-checkbox
+                >全选
+                </el-checkbox
                 >
                 <div style="margin: 15px 0"></div>
                 <el-checkbox-group
@@ -147,7 +153,8 @@
                         v-for="city in cities"
                         :label="city"
                         :key="city.id"
-                        >{{ city }}</el-checkbox
+                    >{{ city }}
+                    </el-checkbox
                     >
                 </el-checkbox-group>
             </el-popover>
@@ -159,7 +166,7 @@
                     style="width: 100%; height: 100%"
                 />
                 <div style="padding: 14px">
-                    <el-skeleton-item variant="h3" style="width: 50%" />
+                    <el-skeleton-item variant="h3" style="width: 50%"/>
                     <div
                         style="
                             display: flex;
@@ -173,7 +180,7 @@
                             variant="text"
                             style="margin-right: 16px"
                         />
-                        <el-skeleton-item variant="text" style="width: 30%" />
+                        <el-skeleton-item variant="text" style="width: 30%"/>
                     </div>
                 </div>
             </template>
@@ -193,13 +200,15 @@
                                         item.orderCode
                                     "
                                     class="link-type"
-                                    >订单编号：{{ item.orderCode }}</router-link
+                                >订单编号：{{ item.orderCode }}
+                                </router-link
                                 >
 
                                 <el-tag
                                     :type="color(item.orderStatus)"
                                     style="margin-left: 10px"
-                                    >{{ item.orderStatusDescribe }}</el-tag
+                                >{{ item.orderStatusDescribe }}
+                                </el-tag
                                 >
                             </div>
                             <div>
@@ -214,53 +223,69 @@
                                 :column="4"
                             >
                                 <el-descriptions-item label="交易流水号">{{
-                                    item.transactionCode || "一"
-                                }}</el-descriptions-item>
+                                        item.transactionCode || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="站点">{{
-                                    item.stationName || "一"
-                                }}</el-descriptions-item>
+                                        item.stationName || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="充电桩枪口号">{{
-                                    item.pileConnectorCode || "一"
-                                }}</el-descriptions-item>
+                                        item.pileConnectorCode || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="卡号">{{
-                                    item.logicCard || "一"
-                                }}</el-descriptions-item>
+                                        item.logicCard || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="微信商户订单号">{{
-                                    item.outTradeNo || "一"
-                                }}</el-descriptions-item>
+                                        item.outTradeNo || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="启动方式">{{
-                                    startMode(item.startMode)
-                                }}</el-descriptions-item>
+                                        startMode(item.startMode)
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="支付方式">{{
-                                    payMode(item.payMode)
-                                }}</el-descriptions-item>
+                                        payMode(item.payMode)
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="支付金额">{{
-                                    item.payAmount || "一"
-                                }}</el-descriptions-item>
+                                        item.payAmount || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="支付状态">{{
-                                    payStatus(item.payStatus)
-                                }}</el-descriptions-item>
+                                        payStatus(item.payStatus)
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="充电度数">{{
-                                    item.chargingDegree || "一"
-                                }}</el-descriptions-item>
+                                        item.chargingDegree || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="起始SOC">{{
-                                    item.startSoc || "一"
-                                }}</el-descriptions-item>
+                                        item.startSoc || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="终止SOC">{{
-                                    item.endSoc || "一"
-                                }}</el-descriptions-item>
+                                        item.endSoc || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="结束充电时间">{{
-                                    item.chargeEndTime || "一"
-                                }}</el-descriptions-item>
+                                        item.chargeEndTime || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="总消费金额">{{
-                                    item.orderAmount || "一"
-                                }}</el-descriptions-item>
+                                        item.orderAmount || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="虚拟金额">{{
-                                    item.virtualAmount || "一"
-                                }}</el-descriptions-item>
+                                        item.virtualAmount || "一"
+                                    }}
+                                </el-descriptions-item>
                                 <el-descriptions-item label="结算金额">{{
-                                    item.settleAmount || "一"
-                                }}</el-descriptions-item>
+                                        item.settleAmount || "一"
+                                    }}
+                                </el-descriptions-item>
                             </el-descriptions>
                             <div
                                 style="
@@ -296,11 +321,12 @@ import {
     totalData,
 } from "@/api/order/order";
 import Template from "@/views/billing/template";
-import { listStation } from "@/api/pile/station";
-import { getDay } from "@/utils/common";
+import {listStation} from "@/api/pile/station";
+import {getDay} from "@/utils/common";
+
 export default {
     name: "Order",
-    components: { Template },
+    components: {Template},
 
     dicts: ["order_status", "start_mode", "pay_mode", "pay_status"],
     data() {
@@ -578,10 +604,11 @@ export default {
                     this.getList();
                     this.$modal.msgSuccess("删除成功");
                 })
-                .catch(() => {});
+                .catch(() => {
+                });
         },
         /** 订单详情序号 */
-        rowOrderDetailIndex({ row, rowIndex }) {
+        rowOrderDetailIndex({row, rowIndex}) {
             row.index = rowIndex + 1;
         },
         /** 订单详情添加按钮操作 */
@@ -671,13 +698,15 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::v-deep
-    .el-descriptions--medium:not(.is-bordered)
-    .el-descriptions-item__cell {
+.el-descriptions--medium:not(.is-bordered)
+.el-descriptions-item__cell {
     padding-bottom: 4px;
 }
+
 ::v-deep .el-descriptions__header {
     margin-bottom: 10px;
 }
+
 .cardview-box {
     width: 100%;
     margin-bottom: 12px;
@@ -685,6 +714,7 @@ export default {
     color: #4a4a4a;
     border: 1px solid #f0f0f0;
 }
+
 .cardview-static {
     height: 100%;
     width: 100%;
@@ -696,6 +726,7 @@ export default {
     line-height: 46px;
     background-color: #f0f0f0;
 }
+
 .flex {
     display: flex;
     justify-content: space-between;