From 7d3753fe65311f1514d64dab371ec54d3dd221fe Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 21 Mar 2023 10:28:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9Decoder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/yunkuaichong/NettyServerChannelInitializer.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java
index ad6efd175..f3f43a83a 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java
@@ -1,6 +1,6 @@
 package com.jsowell.netty.server.yunkuaichong;
 
-import com.jsowell.netty.decoder.StartAndLengthFieldFrameDecoder;
+import com.jsowell.netty.decoder.CustomDecoder;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
@@ -20,8 +20,8 @@ public class NettyServerChannelInitializer extends ChannelInitializer<SocketChan
 	@Override
 	protected void initChannel(SocketChannel channel) throws Exception {
 		ChannelPipeline pipeline = channel.pipeline();
-		// pipeline.addLast("decoder",new CustomDecoder());
-		pipeline.addLast("frameDecoder", new StartAndLengthFieldFrameDecoder(0x68));
+		pipeline.addLast("frameDecoder",new CustomDecoder());
+		// pipeline.addLast("frameDecoder", new StartAndLengthFieldFrameDecoder(0x68));
 		pipeline.addLast("decoder", new ByteArrayDecoder());
 		pipeline.addLast("encoder", new ByteArrayDecoder());
 		//读超时时间设置为10s，0表示不监控

From 0239cdbda623de227d2be92dc376fac69f6cddad Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Tue, 21 Mar 2023 16:05:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9Decoder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/yunkuaichong/NettyServerChannelInitializer.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java
index f3f43a83a..8551a6229 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerChannelInitializer.java
@@ -1,6 +1,6 @@
 package com.jsowell.netty.server.yunkuaichong;
 
-import com.jsowell.netty.decoder.CustomDecoder;
+import com.jsowell.netty.decoder.StartAndLengthFieldFrameDecoder;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
@@ -20,8 +20,8 @@ public class NettyServerChannelInitializer extends ChannelInitializer<SocketChan
 	@Override
 	protected void initChannel(SocketChannel channel) throws Exception {
 		ChannelPipeline pipeline = channel.pipeline();
-		pipeline.addLast("frameDecoder",new CustomDecoder());
-		// pipeline.addLast("frameDecoder", new StartAndLengthFieldFrameDecoder(0x68));
+		// pipeline.addLast("frameDecoder",new CustomDecoder());
+		pipeline.addLast("frameDecoder", new StartAndLengthFieldFrameDecoder(0x68));
 		pipeline.addLast("decoder", new ByteArrayDecoder());
 		pipeline.addLast("encoder", new ByteArrayDecoder());
 		//读超时时间设置为10s，0表示不监控

From 80da9cae9bfe98b3397d1c9af4739f97cf80ce0d Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 23 Mar 2023 09:54:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=85=E7=BB=93=E7=AE=97=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=89=8B=E5=8A=A8=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/order/order/orderDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index 30c22265f..7a7807dad 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card class="cardStyle" v-if="orderInfo[0].orderStatus === '4'">
+    <el-card class="cardStyle" v-if="orderInfo[0].orderStatus === '4' || orderInfo[0].orderStatus === '2'">
       <div style="margin: 10px">
         <span style="color: #bf1c1c">该笔订单为异常状态，请检查充电桩状态！</span>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="dialogVisible = true">手动结算</el-button>