From 06cf644ed705427a742479db09407844e6ce5dc5 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Mon, 28 Mar 2022 10:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=88=E7=AB=AF=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xhpc-modules/pom.xml                                          | 1 +
 xhpc-modules/xhpc-card/pom.xml                                | 2 ++
 .../xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java   | 4 ----
 .../src/main/resources/mapper/XhpcChargeOrderMapper.xml       | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/xhpc-modules/pom.xml b/xhpc-modules/pom.xml
index 7e989be8..498e62f6 100644
--- a/xhpc-modules/pom.xml
+++ b/xhpc-modules/pom.xml
@@ -24,6 +24,7 @@
         <module>xhpc-data-big-screen</module>
         <module>xhpc-workorder</module>
         <module>xhpc-tenant</module>
+        <module>xhpc-log</module>
     </modules>
 
     <artifactId>xhpc-modules</artifactId>
diff --git a/xhpc-modules/xhpc-card/pom.xml b/xhpc-modules/xhpc-card/pom.xml
index 4a4fbd9f..c4a3fd22 100644
--- a/xhpc-modules/xhpc-card/pom.xml
+++ b/xhpc-modules/xhpc-card/pom.xml
@@ -74,6 +74,8 @@
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>xhpc-common</artifactId>
+            <version>3.0.0</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
index 951bacd5..7d712357 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
@@ -610,10 +610,6 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
                 }
             }
         });
-        logger.info("<<<<<<<<<1111<<<<<<<<<<<<<<<第三方启动订单号>>>>>>>>>>>>>>>>>:" + internetSerialNumber);
-        logger.info("<<<<<<<<<2222<<<<<<<<<<<<<<<第三方启动订单号>>>>>>>>>>>>>>>>>:" + internetSerialNumber);
-        logger.info("<<<<<<<<<3333<<<<<<<<<<<<<<<第三方启动订单号>>>>>>>>>>>>>>>>>:" + internetSerialNumber);
-        logger.info("<<<<<<<<<4444<<<<<<<<<<<<<<<第三方启动订单号>>>>>>>>>>>>>>>>>:" + internetSerialNumber);
         Map<String, Object> data = new HashMap<>();
         data.put("startTime", startTime);
         data.put("orderNo", orderNo);
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
index ad893332..2309337a 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
@@ -167,7 +167,7 @@
         <if test="tenantId !=null and ''!=tenantId">
             and tenant_id=#{tenantId}
         </if>
-        and del_flag=0 limit 1
+        and del_flag=0 and status=0 limit 1
     </select>
 
     <insert id="addXhpcChargeOrder" parameterType="com.xhpc.order.domain.XhpcChargeOrder" useGeneratedKeys="true"