From 33cfff8e8b361a5df260bdbbd9c74b4014737683 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 14 Dec 2023 11:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuyou/service/impl/FyPayServiceImpl.java  | 20 +++++++++----------
 .../service/impl/ReturnRecordServiceImpl.java |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
index bb91dcd20..a6d8ee0e2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
@@ -84,23 +84,22 @@ public class FyPayServiceImpl implements FyPayService {
         Map<String, String> resMap = Utils.xmlStr2Map(rspXml);
 
         String str = resMap.get("sign");
-        System.out.println(Utils.verifySign(resMap, str));
         if (Utils.verifySign(resMap, str)){
             ThreadUtil.execAsync(() -> {
                 Timer timer = new Timer();
                 timer.schedule(new TimerTask() {
                     @Override
                     public void run() {
-                    try {
-                        Map<String, String> orderQueryRes = queryOrder(map1);
-                        if(!orderQueryRes.get("msg").equals("unpaid")){
-                            timer.cancel();
+                        try {
+                            Map<String, String> orderQueryRes = queryOrder(map1);
+                            if(!orderQueryRes.get("msg").equals("unpaid")){
+                                timer.cancel();
+                            }
+                        } catch (Exception e) {
+                            throw new RuntimeException(e);
                         }
-                    } catch (Exception e) {
-                        throw new RuntimeException(e);
                     }
-                    }
-                    //定时器 立即开始 0.5s一次
+                    //定时器 不延时 立即开始 0.5s一次
                 }, 0,  500);
                 Thread.currentThread().interrupt();
             });
@@ -166,7 +165,8 @@ public class FyPayServiceImpl implements FyPayService {
 //                        修改油罐容量
                         List<JSONObject> jsonObjects = JSONArray.parseArray(map1.get("oilOrder"), JSONObject.class);
                         if (jsonObjects.size()<=1) {
-                            Integer tankId = Integer.valueOf(jsonObjects.get(1).get("tankId").toString());
+
+                            Integer tankId = Integer.valueOf(jsonObjects.get(0).get("tankId").toString());
                             oilOrder.setTankId(tankId);
                             oilOrderService.addOilTracks(oilOrder, oilOrder.getStoreId());
                         }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/ReturnRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/ReturnRecordServiceImpl.java
index 3e43cc32d..557ecc8cd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/ReturnRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/ReturnRecordServiceImpl.java
@@ -46,7 +46,7 @@ public class ReturnRecordServiceImpl extends ServiceImpl<ReturnRecordMapper, Ret
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
             String timestamp = dateFormat.format(new Date());
             String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6);
-            String orderNo = "H"+timestamp+randomString;
+            String orderNo = "2345"+"H"+timestamp+randomString;
             returnRecord.setOrderNo(orderNo);
         }
         baseMapper.insert(returnRecord);