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 @@ xhpc-data-big-screen xhpc-workorder xhpc-tenant + xhpc-log xhpc-modules 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 @@ com.ruoyi xhpc-common + 3.0.0 + compile 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 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 @@ and tenant_id=#{tenantId} - and del_flag=0 limit 1 + and del_flag=0 and status=0 limit 1