fixSearch

src/main/java/com/tmzn/devicelinkykc/message/YkcMsgHandle.java

@@ -188,11 +188,12 @@ public class YkcMsgHandle {
                     byte[] trans = Arrays.copyOfRange(respone_msg, 0, 16);
                     byte[] reason = Arrays.copyOfRange(respone_msg, 16, 17);
                     QueryWrapper<OrderStatus> orderStatusQueryWrapper = new QueryWrapper<>();
-                    orderStatusQueryWrapper.eq("trans_order", trans);
+                    orderStatusQueryWrapper.eq("trans_order", trans).eq("pile_code",deviceConnectionMsg.getDeviceId());
                     OrderStatus one = orderStatusService.getOne(orderStatusQueryWrapper);
                     if(one!=null){
                         QueryWrapper<TransOrder> transOrderQueryWrapper = new QueryWrapper<>();
-                        transOrderQueryWrapper.eq("trans_order", trans);
+                        transOrderQueryWrapper.eq("trans_order", trans).eq("pile_code",deviceConnectionMsg.getDeviceId());
+
                         TransOrder transOrderServiceOne = transOrderService.getOne(transOrderQueryWrapper);
                         if (reason[0] == 0x00) {
                             one.setTransactionOrderReplyStatus(StatusConstant.TRANSACTION_ORDER_REPLY_STATUS_SUCC);

src/main/java/com/tmzn/devicelinkykc/taskQueue/runner/MsgCharngingRunner.java

@@ -247,14 +247,23 @@ public class MsgCharngingRunner {
             }
         }
 
+        int portStatus = 0;
         if(port == 1){
             power = statusJSON.getInteger("power");
             endElec = statusJSON.getInteger("elec");
+            portStatus = statusJSON.getInteger("port_first_status");
         }else{
             power = statusJSON.getInteger("power_1");
             endElec = statusJSON.getInteger("elec_1");
+            portStatus = statusJSON.getInteger("port_second_status");
         }
 
+        //空闲
+        if(portStatus==1){
+            endElec = 0;
+        }
+
+
         if(power==null){
             power = 0;
         }