[功能修复]修复订单编号

src/main/java/com/tmzn/devicelinkykc/frameMsg/frameType/TransactionFlowPushFrame.java

@@ -157,10 +157,11 @@ public class TransactionFlowPushFrame {
         //订单创建时间0和预留原因不存库
         if (createTime > 0||reason!=TransConstant.START_FAIL) {
             try {
-                byte[] transOrders = new byte[8];
-                System.arraycopy(transOrder, 8, transOrders, 0, transOrders.length);
+//                byte[] transOrders = new byte[8];
+//                System.arraycopy(transOrder, 8, transOrders, 0, transOrders.length);
                 QueryWrapper<TransOrder> transOrderQueryWrapper = new QueryWrapper<>();
-                transOrderQueryWrapper.eq("trans", DataConversion.bytesToHexString(transOrders)).eq("pile_code", pileCode);
+//                transOrderQueryWrapper.eq("trans", DataConversion.bytesToHexString(transOrders)).eq("pile_code", pileCode);
+                transOrderQueryWrapper.eq("trans_order",transOrder).eq("pile_code", pileCode);
                 TransOrder transOrderServiceOne = transOrderService.getOne(transOrderQueryWrapper);
                 if(transOrderServiceOne!=null){
                     transOrderServiceOne.setStartTime(new Date(createTime));
@@ -427,10 +428,11 @@ public class TransactionFlowPushFrame {
         if (createTime > 0||reason!=TransConstant.START_FAIL) {
             try {
                 //TODO:测试存订单
-                byte[] transOrders = new byte[8];
-                System.arraycopy(transOrder, 8, transOrders, 0, transOrders.length);
+//                byte[] transOrders = new byte[8];
+//                System.arraycopy(transOrder, 8, transOrders, 0, transOrders.length);
                 QueryWrapper<TransOrder> transOrderQueryWrapper = new QueryWrapper<>();
-                transOrderQueryWrapper.eq("trans", DataConversion.bytesToHexString(transOrders)).eq("pile_code", pileCode);
+//                transOrderQueryWrapper.eq("trans", DataConversion.bytesToHexString(transOrders)).eq("pile_code", pileCode);
+                transOrderQueryWrapper.eq("trans_order",transOrder).eq("pile_code", pileCode);
                 TransOrder transOrderServiceOne = transOrderService.getOne(transOrderQueryWrapper);
                 if(transOrderServiceOne!=null){
                     transOrderServiceOne.setStartTime(new Date(createTime));
@@ -665,10 +667,12 @@ public class TransactionFlowPushFrame {
         //订单创建时间0和预留原因不存库
         if (createTime > 0||reason!=TransConstant.START_FAIL) {
         try {
-                byte[] transOrders = new byte[8];
-                System.arraycopy(transOrder, 8, transOrders, 0, transOrders.length);
+//                byte[] transOrders = new byte[8];
+//                System.arraycopy(transOrder, 8, transOrders, 0, transOrders.length);
                 QueryWrapper<TransOrder> transOrderQueryWrapper = new QueryWrapper<>();
-                transOrderQueryWrapper.eq("trans", DataConversion.bytesToHexString(transOrders)).eq("pile_code", pileCode);
+//                transOrderQueryWrapper.eq("trans", DataConversion.bytesToHexString(transOrders)).eq("pile_code", pileCode);
+//                transOrderQueryWrapper.eq("trans", DataConversion.bytesToHexString(transOrders)).eq("pile_code", pileCode);
+                transOrderQueryWrapper.eq("trans_order",transOrder).eq("pile_code", pileCode);
                 TransOrder transOrderServiceOne = transOrderService.getOne(transOrderQueryWrapper);
                 if(transOrderServiceOne!=null){
                     transOrderServiceOne.setStartTime(new Date(createTime));

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

@@ -501,10 +501,10 @@ public class YkcMsgHandle {
     //保存订单开始状态,记录充电的交易流水
     private void saveTransOrder(OrderStatus orderStatus) {
         TransOrder transOrder = transMapping.orderStatusToTransOrder(orderStatus);
-        byte[] transOrders = new byte[8];
-        System.arraycopy(orderStatus.getTransOrder(), 8, transOrders, 0, transOrders.length);
+//        byte[] transOrders = new byte[8];
+//        System.arraycopy(orderStatus.getTransOrder(), 8, transOrders, 0, transOrders.length);
         //为了云快充app显示的订单号一致,将订单号格式转化一下
-        transOrder.setTrans(DataConversion.bytesToHexString(transOrders));
+        transOrder.setTrans(DataConversion.bytesToHexString(orderStatus.getTransOrder()));
         boolean b = transOrderService.saveOrUpdate(transOrder);
         logger.info("保存订单>>>>>" + DataConversion.bytesToHexString(orderStatus.getTransOrder()) + "结果:" + b);
     }