diff --git a/xhpc-modules/pom.xml b/xhpc-modules/pom.xml
index 3713a8ff..fbc71efb 100644
--- a/xhpc-modules/pom.xml
+++ b/xhpc-modules/pom.xml
@@ -17,14 +17,8 @@
         <module>xhpc-payment</module>
         <module>xhpc-order</module>
         <module>xhpc-wxma</module>
-        <module>xhpc-tradebill</module>
-<!--        <module>xhpc-message-board</module>-->
         <module>xhpc-card</module>
-<!--        <module>xhpc-data-big-screen</module>-->
-        <module>xhpc-workorder</module>
         <module>xhpc-activity</module>
-        <module>xhpc-log</module>
-        <module>xhpc-clearing</module>
     </modules>
 
     <artifactId>xhpc-modules</artifactId>
diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java
index 9a03c3ce..d3e47994 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/XhpcActivityApplication.java
@@ -5,10 +5,14 @@ import com.xhpc.common.security.annotation.EnableRyFeignClients;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 
+@EnableConfigurationProperties
+@ConfigurationPropertiesScan(basePackages = {"com.xhpc.activity.config"})
 @EnableScheduling
 @EnableCustomConfig
 @EnableRyFeignClients
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/config/AliOSSProperties.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/config/AliOSSProperties.java
similarity index 93%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/config/AliOSSProperties.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/config/AliOSSProperties.java
index c8decbc0..522da63a 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/config/AliOSSProperties.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/config/AliOSSProperties.java
@@ -1,4 +1,4 @@
-package com.xhpc.clearing.config;
+package com.xhpc.activity.config;
 
 
 import lombok.Data;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/CommonController.java
similarity index 90%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/CommonController.java
index 4699104a..816a5689 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/CommonController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/CommonController.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.controller;
+package com.xhpc.activity.controller;
 
 
 import com.xhpc.common.core.utils.SecurityUtils;
@@ -8,9 +8,8 @@ import com.xhpc.common.log.annotation.Log;
 import com.xhpc.common.log.enums.BusinessType;
 import com.xhpc.common.util.LogUserUtils;
 import com.xhpc.system.api.model.LoginUser;
-import com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain;
-import com.xhpc.tradebill.service.CommonService;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain;
+import com.xhpc.activity.service.CommonService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/InternetBillController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/InternetBillController.java
similarity index 96%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/InternetBillController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/InternetBillController.java
index e1330568..787bd4e2 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/InternetBillController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/InternetBillController.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.controller;
+package com.xhpc.activity.controller;
 
 
 import com.xhpc.common.core.web.controller.BaseController;
@@ -6,8 +6,8 @@ import com.xhpc.common.core.web.domain.AjaxResult;
 import com.xhpc.common.core.web.page.TableDataInfo;
 import com.xhpc.common.log.annotation.Log;
 import com.xhpc.common.log.enums.BusinessType;
-import com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain;
-import com.xhpc.tradebill.service.InternetBillService;
+import com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain;
+import com.xhpc.activity.service.InternetBillService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/OrderLogController.java
similarity index 94%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/OrderLogController.java
index 1a52f566..94c52f85 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/OrderLogController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/OrderLogController.java
@@ -1,13 +1,11 @@
-package com.xhpc.log.controller;
+package com.xhpc.activity.controller;
 
 import com.xhpc.common.core.utils.SecurityUtils;
 import com.xhpc.common.core.web.controller.BaseController;
 import com.xhpc.common.core.web.page.TableDataInfo;
-import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.common.util.LogUserUtils;
-import com.xhpc.log.service.OrderLogService;
+import com.xhpc.activity.service.OrderLogService;
 import com.xhpc.system.api.model.LoginUser;
-import lombok.extern.java.Log;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/PaymentBillController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/PaymentBillController.java
similarity index 95%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/PaymentBillController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/PaymentBillController.java
index 1000b487..91482898 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/controller/PaymentBillController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/PaymentBillController.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.controller;
+package com.xhpc.activity.controller;
 
 
 import com.xhpc.common.core.web.controller.BaseController;
@@ -6,8 +6,8 @@ import com.xhpc.common.core.web.domain.AjaxResult;
 import com.xhpc.common.core.web.page.TableDataInfo;
 import com.xhpc.common.log.annotation.Log;
 import com.xhpc.common.log.enums.BusinessType;
-import com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain;
-import com.xhpc.tradebill.service.PaymentBillService;
+import com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain;
+import com.xhpc.activity.service.PaymentBillService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/PileLogController.java
similarity index 97%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/PileLogController.java
index 60e6b2e7..4f5bc391 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/PileLogController.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.controller;
+package com.xhpc.activity.controller;
 
 
 import com.xhpc.common.core.utils.SecurityUtils;
@@ -6,7 +6,7 @@ import com.xhpc.common.core.web.controller.BaseController;
 import com.xhpc.common.core.web.page.TableDataInfo;
 import com.xhpc.common.enums.StationDeviceEnum;
 import com.xhpc.common.util.LogUserUtils;
-import com.xhpc.log.service.PileLogService;
+import com.xhpc.activity.service.PileLogService;
 import com.xhpc.system.api.model.LoginUser;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/StationLogController.java
similarity index 94%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/StationLogController.java
index 8f898d5d..8c27ce45 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/StationLogController.java
@@ -1,11 +1,11 @@
-package com.xhpc.log.controller;
+package com.xhpc.activity.controller;
 
 
 import com.xhpc.common.core.utils.SecurityUtils;
 import com.xhpc.common.core.web.controller.BaseController;
 import com.xhpc.common.core.web.domain.AjaxResult;
 import com.xhpc.common.core.web.page.TableDataInfo;
-import com.xhpc.log.service.StationLogService;
+import com.xhpc.activity.service.StationLogService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/SystemLogController.java
similarity index 92%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/SystemLogController.java
index 3ec85d2a..6f98cef1 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/SystemLogController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/SystemLogController.java
@@ -1,10 +1,10 @@
-package com.xhpc.log.controller;
+package com.xhpc.activity.controller;
 
 
 import com.xhpc.common.core.utils.SecurityUtils;
 import com.xhpc.common.core.web.controller.BaseController;
 import com.xhpc.common.core.web.page.TableDataInfo;
-import com.xhpc.log.service.SystemLogService;
+import com.xhpc.activity.service.SystemLogService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkOrderController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkOrderController.java
similarity index 94%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkOrderController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkOrderController.java
index 444aae51..bd61fce6 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkOrderController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkOrderController.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.controller;
+package com.xhpc.activity.controller;
 
 
 import com.xhpc.common.core.domain.R;
@@ -8,8 +8,8 @@ import com.xhpc.common.log.annotation.Log;
 import com.xhpc.common.log.enums.BusinessType;
 import com.xhpc.common.util.LogUserUtils;
 import com.xhpc.system.api.model.LoginUser;
-import com.xhpc.workorder.domain.XhpcWorkOrderDomain;
-import com.xhpc.workorder.service.WorkOrderService;
+import com.xhpc.activity.domain.XhpcWorkOrderDomain;
+import com.xhpc.activity.service.WorkOrderService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkStationController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkStationController.java
similarity index 95%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkStationController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkStationController.java
index ead31294..7726a154 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkStationController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkStationController.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.controller;
+package com.xhpc.activity.controller;
 
 
 import com.xhpc.common.core.domain.R;
@@ -9,10 +9,10 @@ import com.xhpc.common.log.annotation.Log;
 import com.xhpc.common.log.enums.BusinessType;
 import com.xhpc.common.util.LogUserUtils;
 import com.xhpc.system.api.model.LoginUser;
-import com.xhpc.workorder.domain.XhpcStationDeviceDomain;
-import com.xhpc.workorder.service.WorkStationService;
-import com.xhpc.workorder.service.WorkUserService;
-import com.xhpc.workorder.vo.XhpcStationDeviceVo;
+import com.xhpc.activity.domain.XhpcStationDeviceDomain;
+import com.xhpc.activity.service.WorkStationService;
+import com.xhpc.activity.service.WorkUserService;
+import com.xhpc.activity.vo.XhpcStationDeviceVo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkTypeController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkTypeController.java
similarity index 95%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkTypeController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkTypeController.java
index 2ed67005..cf1ba7d3 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkTypeController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/WorkTypeController.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.controller;
+package com.xhpc.activity.controller;
 
 
 import com.xhpc.common.core.domain.R;
@@ -8,8 +8,8 @@ import com.xhpc.common.log.annotation.Log;
 import com.xhpc.common.log.enums.BusinessType;
 import com.xhpc.common.util.LogUserUtils;
 import com.xhpc.system.api.model.LoginUser;
-import com.xhpc.workorder.domain.XhpcWorkTypeDictDomain;
-import com.xhpc.workorder.service.WorkTypeService;
+import com.xhpc.activity.domain.XhpcWorkTypeDictDomain;
+import com.xhpc.activity.service.WorkTypeService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/controller/XhpcClearingBankController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingBankController.java
similarity index 95%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/controller/XhpcClearingBankController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingBankController.java
index 91e372c0..9b32faaf 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/controller/XhpcClearingBankController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingBankController.java
@@ -1,8 +1,8 @@
-package com.xhpc.clearing.controller;
+package com.xhpc.activity.controller;
 
 
-import com.xhpc.clearing.domain.XhpcClearingBankDomain;
-import com.xhpc.clearing.service.XhpcClearingBankService;
+import com.xhpc.activity.domain.XhpcClearingBankDomain;
+import com.xhpc.activity.service.XhpcClearingBankService;
 import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.web.controller.BaseController;
 import com.xhpc.common.core.web.page.TableDataInfo;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/controller/XhpcClearingCheckoutController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java
similarity index 95%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/controller/XhpcClearingCheckoutController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java
index a3ae6054..8434263e 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/controller/XhpcClearingCheckoutController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingCheckoutController.java
@@ -1,9 +1,9 @@
-package com.xhpc.clearing.controller;
+package com.xhpc.activity.controller;
 
 
-import com.xhpc.clearing.domain.XhpcClearingCheckoutDomain;
-import com.xhpc.clearing.service.XhpcClearingCheckoutService;
-import com.xhpc.clearing.vo.ClearingReceiptVo;
+import com.xhpc.activity.domain.XhpcClearingCheckoutDomain;
+import com.xhpc.activity.service.XhpcClearingCheckoutService;
+import com.xhpc.activity.vo.ClearingReceiptVo;
 import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.web.controller.BaseController;
 import com.xhpc.common.core.web.page.TableDataInfo;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/controller/XhpcClearingHistoryOrderController.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
similarity index 94%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/controller/XhpcClearingHistoryOrderController.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
index e4c83118..7ce8fee8 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/controller/XhpcClearingHistoryOrderController.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/controller/XhpcClearingHistoryOrderController.java
@@ -1,11 +1,8 @@
-package com.xhpc.clearing.controller;
+package com.xhpc.activity.controller;
 
 
-import com.alibaba.fastjson.JSON;
-import com.xhpc.clearing.domain.XhpcClearingCheckoutDomain;
-import com.xhpc.clearing.service.XhpcClearingCheckoutService;
-import com.xhpc.clearing.service.XhpcClearingHistoryOrderService;
-import com.xhpc.clearing.vo.ClearingOrderVo;
+import com.xhpc.activity.service.XhpcClearingHistoryOrderService;
+import com.xhpc.activity.vo.ClearingOrderVo;
 import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.StringUtils;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/EtOrderMappingDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/EtOrderMappingDomain.java
similarity index 86%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/EtOrderMappingDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/EtOrderMappingDomain.java
index a1e3b40c..9503b380 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/EtOrderMappingDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/EtOrderMappingDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.domain;
+package com.xhpc.activity.domain;
 
 
 import lombok.Data;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcChargeOrderDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcChargeOrderDomain.java
similarity index 98%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcChargeOrderDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcChargeOrderDomain.java
index 2279e246..2c0b340f 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcChargeOrderDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcChargeOrderDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingBankDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingBankDomain.java
similarity index 97%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingBankDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingBankDomain.java
index 02333c53..ce70cde4 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingBankDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingBankDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.clearing.domain;
+package com.xhpc.activity.domain;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingCheckoutDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingCheckoutDomain.java
similarity index 97%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingCheckoutDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingCheckoutDomain.java
index 88d42f48..3603fe9d 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingCheckoutDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingCheckoutDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.clearing.domain;
+package com.xhpc.activity.domain;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingHistoryOrderDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingHistoryOrderDomain.java
similarity index 99%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingHistoryOrderDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingHistoryOrderDomain.java
index f1a01e7d..32d946c9 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingHistoryOrderDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingHistoryOrderDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.clearing.domain;
+package com.xhpc.activity.domain;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingReceiptDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingReceiptDomain.java
similarity index 95%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingReceiptDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingReceiptDomain.java
index b0821764..4573b6f7 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcClearingReceiptDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcClearingReceiptDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.clearing.domain;
+package com.xhpc.activity.domain;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcDeviceMessageDomain.java
similarity index 95%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcDeviceMessageDomain.java
index e3a35179..1e28710d 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcDeviceMessageDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.domain;
+package com.xhpc.activity.domain;
 
 
 import lombok.Data;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcHistoryOrderDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcHistoryOrderDomain.java
similarity index 94%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcHistoryOrderDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcHistoryOrderDomain.java
index 6c7b83de..896113cb 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/domain/XhpcHistoryOrderDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcHistoryOrderDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.clearing.domain;
+package com.xhpc.activity.domain;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -21,6 +21,11 @@ public class XhpcHistoryOrderDomain implements Serializable {
      */
     private Long chargingStationId;
 
+    /**
+     * 场站名称
+     */
+    private String chargingStationName;
+
     /**
      * 充电订单id
      */
@@ -273,5 +278,15 @@ public class XhpcHistoryOrderDomain implements Serializable {
 
     private String chargingModeName;
 
+    /**
+     * 充电度数
+     */
+    private Double chargingDegree;
+
+    /**
+     * 充电时长
+     */
+    private String chargingTime;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcMessageDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcMessageDomain.java
similarity index 96%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcMessageDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcMessageDomain.java
index 1f097d60..a8067d9c 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcMessageDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcMessageDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.domain;
+package com.xhpc.activity.domain;
 
 import com.xhpc.common.core.web.domain.BaseEntity;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcRechargeOrderDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcRechargeOrderDomain.java
similarity index 97%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcRechargeOrderDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcRechargeOrderDomain.java
index 2a0d8eb4..432b9c3d 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcRechargeOrderDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcRechargeOrderDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcRefundOrderDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcRefundOrderDomain.java
similarity index 97%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcRefundOrderDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcRefundOrderDomain.java
index 36d727ab..fcf67534 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcRefundOrderDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcRefundOrderDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcStationDeviceDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcStationDeviceDomain.java
similarity index 97%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcStationDeviceDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcStationDeviceDomain.java
index a3e71a91..e8f783fa 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcStationDeviceDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcStationDeviceDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.domain;
+package com.xhpc.activity.domain;
 
 import com.xhpc.common.core.annotation.Excel;
 import lombok.Data;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillInternetCheckRecordDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcTradebillInternetCheckRecordDomain.java
similarity index 98%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillInternetCheckRecordDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcTradebillInternetCheckRecordDomain.java
index cc50d65e..f7633a64 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillInternetCheckRecordDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcTradebillInternetCheckRecordDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillPaymentCheckRecordDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcTradebillPaymentCheckRecordDomain.java
similarity index 96%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillPaymentCheckRecordDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcTradebillPaymentCheckRecordDomain.java
index ee5541b9..ad598e93 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillPaymentCheckRecordDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcTradebillPaymentCheckRecordDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillUploadRecordDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcTradebillUploadRecordDomain.java
similarity index 96%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillUploadRecordDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcTradebillUploadRecordDomain.java
index 00aa5fa1..e5891601 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcTradebillUploadRecordDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcTradebillUploadRecordDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkDeptDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkDeptDomain.java
similarity index 96%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkDeptDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkDeptDomain.java
index 4b9a0ed7..a10b5910 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkDeptDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkDeptDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderDomain.java
similarity index 97%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderDomain.java
index 5065e5ec..2bcb9c8f 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderImageDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderImageDomain.java
similarity index 95%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderImageDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderImageDomain.java
index d88f66a0..f4cced6b 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderImageDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderImageDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderPushMessageDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderPushMessageDomain.java
similarity index 96%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderPushMessageDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderPushMessageDomain.java
index 979d93e0..70ed4685 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderPushMessageDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderPushMessageDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderUserDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderUserDomain.java
similarity index 77%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderUserDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderUserDomain.java
index dfcb6817..f2ff9622 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkOrderUserDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkOrderUserDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.domain;
+package com.xhpc.activity.domain;
 
 
 import lombok.Data;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkStationDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkStationDomain.java
similarity index 98%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkStationDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkStationDomain.java
index 235b851b..cea5e698 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkStationDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkStationDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkTypeDictDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkTypeDictDomain.java
similarity index 96%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkTypeDictDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkTypeDictDomain.java
index b0951d4b..dcd85905 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkTypeDictDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkTypeDictDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.domain;
+package com.xhpc.activity.domain;
 
 
 import lombok.Data;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkUserDomain.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkUserDomain.java
similarity index 97%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkUserDomain.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkUserDomain.java
index 91e3f0b1..2aad82c2 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/domain/XhpcWorkUserDomain.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/domain/XhpcWorkUserDomain.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.domain;
+package com.xhpc.activity.domain;
 
 import lombok.Data;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/EtOrderMappingMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/EtOrderMappingMapper.java
similarity index 71%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/EtOrderMappingMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/EtOrderMappingMapper.java
index 2ce49980..0d78a9cf 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/EtOrderMappingMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/EtOrderMappingMapper.java
@@ -1,7 +1,7 @@
-package com.xhpc.tradebill.mapper;
+package com.xhpc.activity.mapper;
 
 
-import com.xhpc.tradebill.domain.EtOrderMappingDomain;
+import com.xhpc.activity.domain.EtOrderMappingDomain;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/SysOperLogMapper.java
similarity index 88%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/SysOperLogMapper.java
index 84571810..a13b03ad 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/SysOperLogMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/SysOperLogMapper.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.mapper;
+package com.xhpc.activity.mapper;
 
 import org.apache.ibatis.annotations.Param;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcChargeOrderMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcChargeOrderMapper.java
similarity index 72%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcChargeOrderMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcChargeOrderMapper.java
index 3c6e4f6f..3056b536 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcChargeOrderMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcChargeOrderMapper.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.mapper;
+package com.xhpc.activity.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcChargingPileMapper.java
similarity index 97%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcChargingPileMapper.java
index 3712feba..ade97a37 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingPileMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcChargingPileMapper.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.mapper;
+package com.xhpc.activity.mapper;
 
 import com.xhpc.common.domain.XhpcChargingPile;
 import org.apache.ibatis.annotations.Param;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcChargingStationMapper.java
similarity index 95%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcChargingStationMapper.java
index c905bf1e..656a648b 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcChargingStationMapper.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.mapper;
+package com.xhpc.activity.mapper;
 
 import org.apache.ibatis.annotations.Param;
 
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingBankMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingBankMapper.java
similarity index 88%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingBankMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingBankMapper.java
index 3e45c509..cf948340 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingBankMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingBankMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.clearing.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.clearing.domain.XhpcClearingBankDomain;
+import com.xhpc.activity.domain.XhpcClearingBankDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingCheckoutMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingCheckoutMapper.java
similarity index 88%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingCheckoutMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingCheckoutMapper.java
index ab2eb793..0ddf3d69 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingCheckoutMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingCheckoutMapper.java
@@ -1,7 +1,7 @@
-package com.xhpc.clearing.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.clearing.domain.XhpcClearingCheckoutDomain;
-import com.xhpc.clearing.vo.CheckoutBankVo;
+import com.xhpc.activity.domain.XhpcClearingCheckoutDomain;
+import com.xhpc.activity.vo.CheckoutBankVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingHistoryOrderMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingHistoryOrderMapper.java
similarity index 96%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingHistoryOrderMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingHistoryOrderMapper.java
index 659cf608..8faee657 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingHistoryOrderMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingHistoryOrderMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.clearing.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain;
+import com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingReceiptMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingReceiptMapper.java
similarity index 81%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingReceiptMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingReceiptMapper.java
index 8ce790cb..11bf2e78 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcClearingReceiptMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcClearingReceiptMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.clearing.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.clearing.domain.XhpcClearingReceiptDomain;
+import com.xhpc.activity.domain.XhpcClearingReceiptDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcDeviceMessageMapper.java
similarity index 96%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcDeviceMessageMapper.java
index c68605d3..f1878e7a 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcDeviceMessageMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcDeviceMessageMapper.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.mapper;
+package com.xhpc.activity.mapper;
 
 
 import org.apache.ibatis.annotations.Mapper;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcHistoryOrderMapper.java
similarity index 56%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcHistoryOrderMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcHistoryOrderMapper.java
index 2dc35397..3a74cf03 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcHistoryOrderMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcHistoryOrderMapper.java
@@ -1,14 +1,30 @@
-package com.xhpc.tradebill.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.tradebill.domain.XhpcHistoryOrderDomain;
-import org.apache.ibatis.annotations.Mapper;
+import com.xhpc.activity.domain.XhpcHistoryOrderDomain;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
-@Mapper
+/**
+ * 历史订单信息 数据层
+ *
+ * @author ruoyi
+ */
 public interface XhpcHistoryOrderMapper {
 
+    List<XhpcHistoryOrderDomain> selectUnsyncOrderList();
+
+
+    int updateStatusBatchByOrderIds(@Param("orderIds") List<Long> orderIds, @Param("status") Integer status);
+
+
+    BigDecimal selectUnclearingAmount(@Param("operatorId")String operatorId);
+
+
+    List<Map<String, Object>> getOrderPage(@Param("params")Map params);
+
 
     XhpcHistoryOrderDomain findOneBySerialNumber(String serialNumber);
 
@@ -21,4 +37,4 @@ public interface XhpcHistoryOrderMapper {
     List<XhpcHistoryOrderDomain> findListByTimeBetween(@Param("startTime") String startTime,
                                                        @Param("endTime")String endTime,
                                                        @Param("tenantId")String tenantId);
-}
\ No newline at end of file
+}
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcMessageMapper.java
similarity index 91%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcMessageMapper.java
index 420215ad..e5973975 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcMessageMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcMessageMapper.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.mapper;
+package com.xhpc.activity.mapper;
 
 
 import org.apache.ibatis.annotations.Mapper;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcRechargeOrderMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcRechargeOrderMapper.java
similarity index 87%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcRechargeOrderMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcRechargeOrderMapper.java
index 2f345328..7a173ce7 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcRechargeOrderMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcRechargeOrderMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.tradebill.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.tradebill.domain.XhpcRechargeOrderDomain;
+import com.xhpc.activity.domain.XhpcRechargeOrderDomain;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcRefundOrderMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcRefundOrderMapper.java
similarity index 87%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcRefundOrderMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcRefundOrderMapper.java
index 2c962a81..c29cc382 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcRefundOrderMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcRefundOrderMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.tradebill.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.tradebill.domain.XhpcRefundOrderDomain;
+import com.xhpc.activity.domain.XhpcRefundOrderDomain;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcStationDeviceMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcStationDeviceMapper.java
similarity index 91%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcStationDeviceMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcStationDeviceMapper.java
index 4e551c08..5b8cf705 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcStationDeviceMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcStationDeviceMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.workorder.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.workorder.domain.XhpcStationDeviceDomain;
+import com.xhpc.activity.domain.XhpcStationDeviceDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcTradebillInternetCheckRecordMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcTradebillInternetCheckRecordMapper.java
similarity index 90%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcTradebillInternetCheckRecordMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcTradebillInternetCheckRecordMapper.java
index c3360614..8a09708c 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcTradebillInternetCheckRecordMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcTradebillInternetCheckRecordMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.tradebill.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcTradebillPaymentCheckRecordMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcTradebillPaymentCheckRecordMapper.java
similarity index 90%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcTradebillPaymentCheckRecordMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcTradebillPaymentCheckRecordMapper.java
index 3aaacc76..a9a2b9ec 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcTradebillPaymentCheckRecordMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcTradebillPaymentCheckRecordMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.tradebill.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcTradebillUploadRecordMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcTradebillUploadRecordMapper.java
similarity index 87%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcTradebillUploadRecordMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcTradebillUploadRecordMapper.java
index d056f8e4..982275fb 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/mapper/XhpcTradebillUploadRecordMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcTradebillUploadRecordMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.tradebill.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkDeptMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkDeptMapper.java
similarity index 87%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkDeptMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkDeptMapper.java
index 3c65ca71..eea8d766 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkDeptMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkDeptMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.workorder.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.workorder.domain.XhpcWorkDeptDomain;
+import com.xhpc.activity.domain.XhpcWorkDeptDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderImageMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkOrderImageMapper.java
similarity index 88%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderImageMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkOrderImageMapper.java
index 44b38acb..b78cbc8f 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderImageMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkOrderImageMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.workorder.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.workorder.domain.XhpcWorkOrderImageDomain;
+import com.xhpc.activity.domain.XhpcWorkOrderImageDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkOrderMapper.java
similarity index 85%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkOrderMapper.java
index 12216b9f..115efca5 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkOrderMapper.java
@@ -1,7 +1,7 @@
-package com.xhpc.workorder.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.workorder.domain.XhpcWorkOrderDomain;
-import com.xhpc.workorder.domain.XhpcWorkOrderUserDomain;
+import com.xhpc.activity.domain.XhpcWorkOrderDomain;
+import com.xhpc.activity.domain.XhpcWorkOrderUserDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderPushMessageMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkOrderPushMessageMapper.java
similarity index 81%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderPushMessageMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkOrderPushMessageMapper.java
index 1a3a8758..d5d46fe5 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkOrderPushMessageMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkOrderPushMessageMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.workorder.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.workorder.domain.XhpcWorkOrderPushMessageDomain;
+import com.xhpc.activity.domain.XhpcWorkOrderPushMessageDomain;
 
 public interface XhpcWorkOrderPushMessageMapper {
     int deleteByPrimaryKey(Long orderPushId);
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkStationMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkStationMapper.java
similarity index 88%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkStationMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkStationMapper.java
index 1d27466c..4fb4c11e 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkStationMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkStationMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.workorder.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.workorder.domain.XhpcWorkStationDomain;
+import com.xhpc.activity.domain.XhpcWorkStationDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkTypeDictMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkTypeDictMapper.java
similarity index 89%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkTypeDictMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkTypeDictMapper.java
index 7c37e629..df85d241 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkTypeDictMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkTypeDictMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.workorder.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.workorder.domain.XhpcWorkTypeDictDomain;
+import com.xhpc.activity.domain.XhpcWorkTypeDictDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkUserMapper.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkUserMapper.java
similarity index 88%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkUserMapper.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkUserMapper.java
index d8ae76d7..6d5723f4 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/mapper/XhpcWorkUserMapper.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcWorkUserMapper.java
@@ -1,6 +1,6 @@
-package com.xhpc.workorder.mapper;
+package com.xhpc.activity.mapper;
 
-import com.xhpc.workorder.domain.XhpcWorkUserDomain;
+import com.xhpc.activity.domain.XhpcWorkUserDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/CommonService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/CommonService.java
similarity index 82%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/CommonService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/CommonService.java
index 2d1a86e6..3e2ce5fe 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/CommonService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/CommonService.java
@@ -1,7 +1,7 @@
-package com.xhpc.tradebill.service;
+package com.xhpc.activity.service;
 
 
-import com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/InternetBillService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/InternetBillService.java
similarity index 96%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/InternetBillService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/InternetBillService.java
index d3e526e1..80f26ae2 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/InternetBillService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/InternetBillService.java
@@ -1,7 +1,7 @@
-package com.xhpc.tradebill.service;
+package com.xhpc.activity.service;
 
 
-import com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/OrderLogService.java
similarity index 91%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/OrderLogService.java
index 604b7475..f39d0bee 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/OrderLogService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/OrderLogService.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.service;
+package com.xhpc.activity.service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/PaymentBillService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/PaymentBillService.java
similarity index 95%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/PaymentBillService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/PaymentBillService.java
index 70bec913..4e5a621a 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/PaymentBillService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/PaymentBillService.java
@@ -1,7 +1,7 @@
-package com.xhpc.tradebill.service;
+package com.xhpc.activity.service;
 
 
-import com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/PileLogService.java
similarity index 91%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/PileLogService.java
index 4243d1e4..d7bebd2a 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/PileLogService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/PileLogService.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.service;
+package com.xhpc.activity.service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/StationLogService.java
similarity index 88%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/StationLogService.java
index 5d9ed7f9..2cbd17c0 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/StationLogService.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.service;
+package com.xhpc.activity.service;
 
 import java.util.List;
 import java.util.Map;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/SystemLogService.java
similarity index 81%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/SystemLogService.java
index 4ae604db..bad592a9 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/SystemLogService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/SystemLogService.java
@@ -1,4 +1,4 @@
-package com.xhpc.log.service;
+package com.xhpc.activity.service;
 
 
 import java.util.List;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkOrderService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkOrderService.java
similarity index 82%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkOrderService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkOrderService.java
index 865f856d..f869d557 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkOrderService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkOrderService.java
@@ -1,7 +1,7 @@
-package com.xhpc.workorder.service;
+package com.xhpc.activity.service;
 
 
-import com.xhpc.workorder.domain.XhpcWorkOrderDomain;
+import com.xhpc.activity.domain.XhpcWorkOrderDomain;
 
 import java.util.List;
 import java.util.Map;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkStationService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkStationService.java
similarity index 80%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkStationService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkStationService.java
index c949114e..e41d8ba8 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkStationService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkStationService.java
@@ -1,8 +1,8 @@
-package com.xhpc.workorder.service;
+package com.xhpc.activity.service;
 
-import com.xhpc.workorder.domain.XhpcStationDeviceDomain;
-import com.xhpc.workorder.domain.XhpcWorkStationDomain;
-import com.xhpc.workorder.vo.XhpcStationDeviceVo;
+import com.xhpc.activity.domain.XhpcStationDeviceDomain;
+import com.xhpc.activity.domain.XhpcWorkStationDomain;
+import com.xhpc.activity.vo.XhpcStationDeviceVo;
 
 import java.util.List;
 import java.util.Map;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkTypeService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkTypeService.java
similarity index 84%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkTypeService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkTypeService.java
index 273ed0f2..0fd56575 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkTypeService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkTypeService.java
@@ -1,6 +1,6 @@
-package com.xhpc.workorder.service;
+package com.xhpc.activity.service;
 
-import com.xhpc.workorder.domain.XhpcWorkTypeDictDomain;
+import com.xhpc.activity.domain.XhpcWorkTypeDictDomain;
 
 import java.util.List;
 import java.util.Map;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkUserService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkUserService.java
similarity index 81%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkUserService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkUserService.java
index 7d31c735..7f55d801 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/WorkUserService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/WorkUserService.java
@@ -1,6 +1,6 @@
-package com.xhpc.workorder.service;
+package com.xhpc.activity.service;
 
-import com.xhpc.workorder.domain.XhpcWorkUserDomain;
+import com.xhpc.activity.domain.XhpcWorkUserDomain;
 
 import java.util.List;
 import java.util.Map;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/XhpcClearingBankService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/XhpcClearingBankService.java
similarity index 83%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/XhpcClearingBankService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/XhpcClearingBankService.java
index faad997c..a1f086ba 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/XhpcClearingBankService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/XhpcClearingBankService.java
@@ -1,6 +1,6 @@
-package com.xhpc.clearing.service;
+package com.xhpc.activity.service;
 
-import com.xhpc.clearing.domain.XhpcClearingBankDomain;
+import com.xhpc.activity.domain.XhpcClearingBankDomain;
 
 import java.util.List;
 import java.util.Map;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/XhpcClearingCheckoutService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/XhpcClearingCheckoutService.java
similarity index 85%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/XhpcClearingCheckoutService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/XhpcClearingCheckoutService.java
index f5210c5f..bf5019e0 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/XhpcClearingCheckoutService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/XhpcClearingCheckoutService.java
@@ -1,8 +1,7 @@
-package com.xhpc.clearing.service;
+package com.xhpc.activity.service;
 
-import com.xhpc.clearing.domain.XhpcClearingCheckoutDomain;
-import com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain;
-import com.xhpc.clearing.vo.ClearingReceiptVo;
+import com.xhpc.activity.domain.XhpcClearingCheckoutDomain;
+import com.xhpc.activity.vo.ClearingReceiptVo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/XhpcClearingHistoryOrderService.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/XhpcClearingHistoryOrderService.java
similarity index 79%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/XhpcClearingHistoryOrderService.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/XhpcClearingHistoryOrderService.java
index f85152e8..7714699d 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/XhpcClearingHistoryOrderService.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/XhpcClearingHistoryOrderService.java
@@ -1,7 +1,7 @@
-package com.xhpc.clearing.service;
+package com.xhpc.activity.service;
 
-import com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain;
-import com.xhpc.clearing.vo.ClearingOrderVo;
+import com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain;
+import com.xhpc.activity.vo.ClearingOrderVo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/impl/CommonServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/CommonServiceImpl.java
similarity index 94%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/impl/CommonServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/CommonServiceImpl.java
index 27c67cb5..dbb7fa05 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/impl/CommonServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/CommonServiceImpl.java
@@ -1,15 +1,15 @@
-package com.xhpc.tradebill.service.impl;
+package com.xhpc.activity.service.impl;
 
 import com.aliyun.oss.OSSClient;
 import com.xhpc.common.core.utils.SecurityUtils;
-import com.xhpc.tradebill.config.AliOSSProperties;
-import com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain;
-import com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain;
-import com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain;
-import com.xhpc.tradebill.mapper.XhpcTradebillUploadRecordMapper;
-import com.xhpc.tradebill.service.CommonService;
-import com.xhpc.tradebill.service.InternetBillService;
-import com.xhpc.tradebill.service.PaymentBillService;
+import com.xhpc.activity.config.AliOSSProperties;
+import com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain;
+import com.xhpc.activity.mapper.XhpcTradebillUploadRecordMapper;
+import com.xhpc.activity.service.CommonService;
+import com.xhpc.activity.service.InternetBillService;
+import com.xhpc.activity.service.PaymentBillService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/impl/InternetBillServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java
similarity index 97%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/impl/InternetBillServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java
index ad3c1977..c30ac33a 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/impl/InternetBillServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.service.impl;
+package com.xhpc.activity.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
@@ -9,17 +9,16 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.xhpc.common.core.utils.SecurityUtils;
 import com.xhpc.common.core.utils.poi.ExcelUtil;
-import com.xhpc.tradebill.domain.XhpcHistoryOrderDomain;
-import com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain;
-import com.xhpc.tradebill.mapper.EtOrderMappingMapper;
-import com.xhpc.tradebill.mapper.XhpcHistoryOrderMapper;
-import com.xhpc.tradebill.mapper.XhpcTradebillInternetCheckRecordMapper;
-import com.xhpc.tradebill.service.InternetBillService;
-import com.xhpc.tradebill.utils.DownloadUtil;
-import com.xhpc.tradebill.vo.HDTradebillVo;
-import com.xhpc.tradebill.vo.KDTradebillVo;
-import com.xhpc.tradebill.vo.XDTTradebillVo;
-import com.xhpc.tradebill.vo.XJTradeBillVo;
+import com.xhpc.activity.domain.XhpcHistoryOrderDomain;
+import com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain;
+import com.xhpc.activity.mapper.XhpcHistoryOrderMapper;
+import com.xhpc.activity.mapper.XhpcTradebillInternetCheckRecordMapper;
+import com.xhpc.activity.service.InternetBillService;
+import com.xhpc.activity.utils.DownloadUtil;
+import com.xhpc.activity.vo.HDTradebillVo;
+import com.xhpc.activity.vo.KDTradebillVo;
+import com.xhpc.activity.vo.XDTTradebillVo;
+import com.xhpc.activity.vo.XJTradeBillVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/OrderLogServiceImpl.java
similarity index 90%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/OrderLogServiceImpl.java
index e67291d5..ff6dbfff 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/OrderLogServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/OrderLogServiceImpl.java
@@ -1,13 +1,12 @@
-package com.xhpc.log.service.impl;
+package com.xhpc.activity.service.impl;
 
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
-import com.xhpc.log.mapper.XhpcDeviceMessageMapper;
-import com.xhpc.log.mapper.XhpcHistoryOrderMapper;
-import com.xhpc.log.mapper.XhpcMessageMapper;
-import com.xhpc.log.service.OrderLogService;
+import com.xhpc.activity.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.activity.mapper.XhpcHistoryOrderMapper;
+import com.xhpc.activity.service.OrderLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/impl/PaymentBillServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/PaymentBillServiceImpl.java
similarity index 97%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/impl/PaymentBillServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/PaymentBillServiceImpl.java
index 81b46d35..e74bbb7a 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/service/impl/PaymentBillServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/PaymentBillServiceImpl.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.service.impl;
+package com.xhpc.activity.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
@@ -10,12 +10,12 @@ import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.xhpc.common.core.utils.SecurityUtils;
-import com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain;
-import com.xhpc.tradebill.mapper.XhpcRechargeOrderMapper;
-import com.xhpc.tradebill.mapper.XhpcRefundOrderMapper;
-import com.xhpc.tradebill.mapper.XhpcTradebillPaymentCheckRecordMapper;
-import com.xhpc.tradebill.service.PaymentBillService;
-import com.xhpc.tradebill.utils.DownloadUtil;
+import com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain;
+import com.xhpc.activity.mapper.XhpcRechargeOrderMapper;
+import com.xhpc.activity.mapper.XhpcRefundOrderMapper;
+import com.xhpc.activity.mapper.XhpcTradebillPaymentCheckRecordMapper;
+import com.xhpc.activity.service.PaymentBillService;
+import com.xhpc.activity.utils.DownloadUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tools.zip.ZipEntry;
 import org.apache.tools.zip.ZipFile;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/PileLogServiceImpl.java
similarity index 91%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/PileLogServiceImpl.java
index 70387e76..517fceb4 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/PileLogServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/PileLogServiceImpl.java
@@ -1,12 +1,12 @@
-package com.xhpc.log.service.impl;
+package com.xhpc.activity.service.impl;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.xhpc.common.enums.StationDeviceEnum;
-import com.xhpc.log.mapper.XhpcChargingPileMapper;
-import com.xhpc.log.mapper.XhpcDeviceMessageMapper;
-import com.xhpc.log.service.PileLogService;
+import com.xhpc.activity.mapper.XhpcChargingPileMapper;
+import com.xhpc.activity.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.activity.service.PileLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/StationLogServiceImpl.java
similarity index 86%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/StationLogServiceImpl.java
index 70dd33e3..eff1bdc2 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/StationLogServiceImpl.java
@@ -1,7 +1,7 @@
-package com.xhpc.log.service.impl;
+package com.xhpc.activity.service.impl;
 
-import com.xhpc.log.mapper.XhpcChargingStationMapper;
-import com.xhpc.log.service.StationLogService;
+import com.xhpc.activity.mapper.XhpcChargingStationMapper;
+import com.xhpc.activity.service.StationLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/SystemLogServiceImpl.java
similarity index 74%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/SystemLogServiceImpl.java
index 67dfb434..63ca24f0 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/SystemLogServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/SystemLogServiceImpl.java
@@ -1,7 +1,7 @@
-package com.xhpc.log.service.impl;
+package com.xhpc.activity.service.impl;
 
-import com.xhpc.log.mapper.SysOperLogMapper;
-import com.xhpc.log.service.SystemLogService;
+import com.xhpc.activity.mapper.SysOperLogMapper;
+import com.xhpc.activity.service.SystemLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkOrderServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
similarity index 97%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkOrderServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
index 1f71c516..0a99cae2 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkOrderServiceImpl.java
@@ -1,12 +1,12 @@
-package com.xhpc.workorder.service.impl;
+package com.xhpc.activity.service.impl;
 
 import com.xhpc.common.api.SmsService;
 import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.utils.StringUtils;
-import com.xhpc.workorder.domain.*;
-import com.xhpc.workorder.mapper.*;
-import com.xhpc.workorder.service.WorkOrderService;
-import com.xhpc.workorder.service.WorkUserService;
+import com.xhpc.activity.domain.*;
+import com.xhpc.activity.mapper.*;
+import com.xhpc.activity.service.WorkOrderService;
+import com.xhpc.activity.service.WorkUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkStationServiceImpl.java
similarity index 95%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkStationServiceImpl.java
index 075625a2..715e3f7a 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkStationServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkStationServiceImpl.java
@@ -1,15 +1,15 @@
-package com.xhpc.workorder.service.impl;
+package com.xhpc.activity.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.StringUtils;
 import com.xhpc.common.redis.service.RedisService;
-import com.xhpc.workorder.domain.XhpcStationDeviceDomain;
-import com.xhpc.workorder.domain.XhpcWorkStationDomain;
-import com.xhpc.workorder.mapper.XhpcStationDeviceMapper;
-import com.xhpc.workorder.mapper.XhpcWorkStationMapper;
-import com.xhpc.workorder.service.WorkStationService;
-import com.xhpc.workorder.vo.XhpcStationDeviceVo;
+import com.xhpc.activity.domain.XhpcStationDeviceDomain;
+import com.xhpc.activity.domain.XhpcWorkStationDomain;
+import com.xhpc.activity.mapper.XhpcStationDeviceMapper;
+import com.xhpc.activity.mapper.XhpcWorkStationMapper;
+import com.xhpc.activity.service.WorkStationService;
+import com.xhpc.activity.vo.XhpcStationDeviceVo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkTypeServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java
similarity index 94%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkTypeServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java
index c48c6b74..07168494 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkTypeServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkTypeServiceImpl.java
@@ -1,10 +1,10 @@
-package com.xhpc.workorder.service.impl;
+package com.xhpc.activity.service.impl;
 
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.StringUtils;
-import com.xhpc.workorder.domain.XhpcWorkTypeDictDomain;
-import com.xhpc.workorder.mapper.XhpcWorkTypeDictMapper;
-import com.xhpc.workorder.service.WorkTypeService;
+import com.xhpc.activity.domain.XhpcWorkTypeDictDomain;
+import com.xhpc.activity.mapper.XhpcWorkTypeDictMapper;
+import com.xhpc.activity.service.WorkTypeService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkUserServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java
similarity index 86%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkUserServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java
index cb90efcc..8b3074f2 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/service/impl/WorkUserServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/WorkUserServiceImpl.java
@@ -1,9 +1,9 @@
-package com.xhpc.workorder.service.impl;
+package com.xhpc.activity.service.impl;
 
-import com.xhpc.workorder.domain.XhpcWorkUserDomain;
-import com.xhpc.workorder.mapper.XhpcWorkDeptMapper;
-import com.xhpc.workorder.mapper.XhpcWorkUserMapper;
-import com.xhpc.workorder.service.WorkUserService;
+import com.xhpc.activity.domain.XhpcWorkUserDomain;
+import com.xhpc.activity.mapper.XhpcWorkDeptMapper;
+import com.xhpc.activity.mapper.XhpcWorkUserMapper;
+import com.xhpc.activity.service.WorkUserService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/impl/XhpcClearingBankServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingBankServiceImpl.java
similarity index 93%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/impl/XhpcClearingBankServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingBankServiceImpl.java
index 4aa39f19..e5a45393 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/impl/XhpcClearingBankServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingBankServiceImpl.java
@@ -1,13 +1,12 @@
-package com.xhpc.clearing.service.impl;
+package com.xhpc.activity.service.impl;
 
-import com.xhpc.clearing.domain.XhpcClearingBankDomain;
-import com.xhpc.clearing.mapper.XhpcClearingBankMapper;
-import com.xhpc.clearing.service.XhpcClearingBankService;
+import com.xhpc.activity.domain.XhpcClearingBankDomain;
+import com.xhpc.activity.mapper.XhpcClearingBankMapper;
+import com.xhpc.activity.service.XhpcClearingBankService;
 import com.xhpc.common.api.SmsService;
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.StringUtils;
 import com.xhpc.common.redis.service.RedisService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/impl/XhpcClearingCheckoutServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java
similarity index 94%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/impl/XhpcClearingCheckoutServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java
index b8cd52fd..5314305a 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/impl/XhpcClearingCheckoutServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingCheckoutServiceImpl.java
@@ -1,22 +1,21 @@
-package com.xhpc.clearing.service.impl;
+package com.xhpc.activity.service.impl;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.BigExcelWriter;
 import cn.hutool.poi.excel.ExcelUtil;
-import cn.hutool.poi.excel.ExcelWriter;
-import com.xhpc.clearing.config.AliOSSProperties;
-import com.xhpc.clearing.domain.XhpcClearingBankDomain;
-import com.xhpc.clearing.domain.XhpcClearingCheckoutDomain;
-import com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain;
-import com.xhpc.clearing.domain.XhpcClearingReceiptDomain;
-import com.xhpc.clearing.mapper.XhpcClearingBankMapper;
-import com.xhpc.clearing.mapper.XhpcClearingCheckoutMapper;
-import com.xhpc.clearing.mapper.XhpcClearingHistoryOrderMapper;
-import com.xhpc.clearing.mapper.XhpcClearingReceiptMapper;
-import com.xhpc.clearing.service.XhpcClearingCheckoutService;
-import com.xhpc.clearing.utils.DownloadUtil;
-import com.xhpc.clearing.vo.CheckoutBankVo;
-import com.xhpc.clearing.vo.ClearingReceiptVo;
+import com.xhpc.activity.config.AliOSSProperties;
+import com.xhpc.activity.domain.XhpcClearingBankDomain;
+import com.xhpc.activity.domain.XhpcClearingCheckoutDomain;
+import com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain;
+import com.xhpc.activity.domain.XhpcClearingReceiptDomain;
+import com.xhpc.activity.mapper.XhpcClearingBankMapper;
+import com.xhpc.activity.mapper.XhpcClearingCheckoutMapper;
+import com.xhpc.activity.mapper.XhpcClearingHistoryOrderMapper;
+import com.xhpc.activity.mapper.XhpcClearingReceiptMapper;
+import com.xhpc.activity.service.XhpcClearingCheckoutService;
+import com.xhpc.activity.utils.DownloadUtil;
+import com.xhpc.activity.vo.CheckoutBankVo;
+import com.xhpc.activity.vo.ClearingReceiptVo;
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.SecurityUtils;
 import com.xhpc.common.core.utils.StringUtils;
@@ -24,9 +23,7 @@ import com.xhpc.common.core.web.service.BaseService;
 import com.xhpc.common.redis.service.RedisService;
 import com.xhpc.common.security.service.TokenService;
 import com.xhpc.common.util.UserTypeUtil;
-import com.xhpc.system.api.domain.SysUser;
 import com.xhpc.system.api.model.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/impl/XhpcClearingHistoryOrderServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java
similarity index 92%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/impl/XhpcClearingHistoryOrderServiceImpl.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java
index 9011deae..94cd09cd 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/service/impl/XhpcClearingHistoryOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcClearingHistoryOrderServiceImpl.java
@@ -1,17 +1,15 @@
-package com.xhpc.clearing.service.impl;
+package com.xhpc.activity.service.impl;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
-import com.alibaba.fastjson.JSON;
-import com.xhpc.clearing.domain.XhpcClearingBankDomain;
-import com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain;
-import com.xhpc.clearing.mapper.XhpcClearingBankMapper;
-import com.xhpc.clearing.mapper.XhpcClearingCheckoutMapper;
-import com.xhpc.clearing.mapper.XhpcClearingHistoryOrderMapper;
-import com.xhpc.clearing.mapper.XhpcHistoryOrderMapper;
-import com.xhpc.clearing.service.XhpcClearingHistoryOrderService;
-import com.xhpc.clearing.vo.ClearingOrderVo;
+import com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain;
+import com.xhpc.activity.mapper.XhpcClearingBankMapper;
+import com.xhpc.activity.mapper.XhpcClearingCheckoutMapper;
+import com.xhpc.activity.mapper.XhpcClearingHistoryOrderMapper;
+import com.xhpc.activity.mapper.XhpcHistoryOrderMapper;
+import com.xhpc.activity.service.XhpcClearingHistoryOrderService;
+import com.xhpc.activity.vo.ClearingOrderVo;
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.StringUtils;
 import org.springframework.stereotype.Service;
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/task/AutoClearDataTask.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoClearDataTask.java
similarity index 87%
rename from xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/task/AutoClearDataTask.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoClearDataTask.java
index c8d16121..f2fe0a1b 100644
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/task/AutoClearDataTask.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoClearDataTask.java
@@ -1,8 +1,8 @@
-package com.xhpc.log.task;
+package com.xhpc.activity.task;
 
 
 import com.xhpc.common.util.DateUtil;
-import com.xhpc.log.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.activity.mapper.XhpcDeviceMessageMapper;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/task/SyncHistoryOrderTask.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java
similarity index 85%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/task/SyncHistoryOrderTask.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java
index 24568baf..887f325f 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/task/SyncHistoryOrderTask.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java
@@ -1,10 +1,10 @@
-package com.xhpc.clearing.task;
+package com.xhpc.activity.task;
 
 
-import com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain;
-import com.xhpc.clearing.domain.XhpcHistoryOrderDomain;
-import com.xhpc.clearing.mapper.XhpcClearingHistoryOrderMapper;
-import com.xhpc.clearing.mapper.XhpcHistoryOrderMapper;
+import com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain;
+import com.xhpc.activity.domain.XhpcHistoryOrderDomain;
+import com.xhpc.activity.mapper.XhpcClearingHistoryOrderMapper;
+import com.xhpc.activity.mapper.XhpcHistoryOrderMapper;
 import com.xhpc.common.core.utils.bean.BeanUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/utils/DownloadUtil.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/utils/DownloadUtil.java
similarity index 93%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/utils/DownloadUtil.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/utils/DownloadUtil.java
index 72d9a8a9..5432ac00 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/utils/DownloadUtil.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/utils/DownloadUtil.java
@@ -1,4 +1,4 @@
-package com.xhpc.clearing.utils;
+package com.xhpc.activity.utils;
 
 import cn.hutool.http.HttpUtil;
 import com.xhpc.common.core.utils.StringUtils;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/vo/CheckoutBankVo.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/CheckoutBankVo.java
similarity index 98%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/vo/CheckoutBankVo.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/CheckoutBankVo.java
index 97e3abae..bbdddb8a 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/vo/CheckoutBankVo.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/CheckoutBankVo.java
@@ -1,4 +1,4 @@
-package com.xhpc.clearing.vo;
+package com.xhpc.activity.vo;
 
 
 import com.xhpc.common.core.annotation.Excel;
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/vo/ClearingOrderVo.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/ClearingOrderVo.java
similarity index 87%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/vo/ClearingOrderVo.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/ClearingOrderVo.java
index 6505a925..edd1968e 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/vo/ClearingOrderVo.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/ClearingOrderVo.java
@@ -1,10 +1,8 @@
-package com.xhpc.clearing.vo;
+package com.xhpc.activity.vo;
 
 
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class ClearingOrderVo {
 
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/vo/ClearingReceiptVo.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/ClearingReceiptVo.java
similarity index 58%
rename from xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/vo/ClearingReceiptVo.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/ClearingReceiptVo.java
index 49742ee3..85b9c1cf 100644
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/vo/ClearingReceiptVo.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/ClearingReceiptVo.java
@@ -1,8 +1,7 @@
-package com.xhpc.clearing.vo;
+package com.xhpc.activity.vo;
 
-import com.xhpc.clearing.domain.XhpcClearingReceiptDomain;
+import com.xhpc.activity.domain.XhpcClearingReceiptDomain;
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/HDTradebillVo.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/HDTradebillVo.java
similarity index 98%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/HDTradebillVo.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/HDTradebillVo.java
index 9d15c50c..b1008f56 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/HDTradebillVo.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/HDTradebillVo.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.vo;
+package com.xhpc.activity.vo;
 
 import cn.hutool.core.annotation.Alias;
 import com.xhpc.common.core.annotation.Excel;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/KDTradebillVo.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/KDTradebillVo.java
similarity index 97%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/KDTradebillVo.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/KDTradebillVo.java
index 3ad83025..ef8af076 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/KDTradebillVo.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/KDTradebillVo.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.vo;
+package com.xhpc.activity.vo;
 
 
 import com.xhpc.common.core.annotation.Excel;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/XDTTradebillVo.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/XDTTradebillVo.java
similarity index 99%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/XDTTradebillVo.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/XDTTradebillVo.java
index 8027956c..2039442a 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/XDTTradebillVo.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/XDTTradebillVo.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.vo;
+package com.xhpc.activity.vo;
 
 
 import cn.hutool.core.annotation.Alias;
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/XJTradeBillVo.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/XJTradeBillVo.java
similarity index 99%
rename from xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/XJTradeBillVo.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/XJTradeBillVo.java
index 9e54a4c2..bd7c8199 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/vo/XJTradeBillVo.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/XJTradeBillVo.java
@@ -1,4 +1,4 @@
-package com.xhpc.tradebill.vo;
+package com.xhpc.activity.vo;
 
 import cn.hutool.core.annotation.Alias;
 import com.xhpc.common.core.annotation.Excel;
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/vo/XhpcStationDeviceVo.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/XhpcStationDeviceVo.java
similarity index 89%
rename from xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/vo/XhpcStationDeviceVo.java
rename to xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/XhpcStationDeviceVo.java
index 8beaac64..f878629a 100644
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/vo/XhpcStationDeviceVo.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/vo/XhpcStationDeviceVo.java
@@ -1,4 +1,4 @@
-package com.xhpc.workorder.vo;
+package com.xhpc.activity.vo;
 
 
 import lombok.Data;
diff --git a/xhpc-modules/xhpc-activity/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-activity/src/main/resources/bootstrap.yml
index 3b6e66ea..a2de59db 100644
--- a/xhpc-modules/xhpc-activity/src/main/resources/bootstrap.yml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/bootstrap.yml
@@ -28,3 +28,23 @@ logging:
   level:
     root: info
     com.xhpc.activity.mapper: debug
+
+
+wx:
+  pay:
+    appId: "wxd0a48e00319ef8a7"
+    mchId: "1514355771"
+    mchKey: "sichuanxianghuakejiyouxiangongsi"
+    keyPath:
+
+
+alibaba:
+  pay:
+    gatewayDomain: "https://openapi.alipay.com/gateway.do"
+    serverDomain: "https://www.scxhua.cn/prod-api/xhpc-payment/alipay/notifyUrl"
+    publicKey:
+    privateKey: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCGHX1s315EKjoIBkNiF3IxCAmvtVg+TdCDL/XmJZWdcZ23tEWmmIMsLRCLUKsaPfTEhnqD6EFJnmpJu4teDImo3aDbOoO31YFEXjMXUnTTS/dtDVEo1OecsRL+Re43KSohOkIL1TMyTuNfeIglQTuhCSZ3LOEOx4OHpYwcrLp8p1ORvAS7x35nsmjLp3oQTJo9RWfzfEaKbm6cxsWLKyr5/5eGDXrUHNC5hIDLjoJbe6iqNKyIiPJHtPZfJ36PcWa7PFvx4X+Ded32KZb2AA3p9w/HX7gn1MnRfT5NGH0k3ggxLNarDU8g6JjQYgNtmE/R8gbp99BudZNfDoSF1llNAgMBAAECggEAaTa9bSoXM/bErALt3ghyx1B8+OGVpts5F5IKoVEe/PNjPfkpIzdGwONhtUnF0cKFQaAWgWE1xuGGlO2Sumevn1Cvnw1axF+1F8Om5UcE67cPFvh5kUTlpyGrutt1tMSQjpy7r7jEf1UwP3e5pzBz7TPWf2wv635OC56uOtivPJZ+8vg7VYon/mNXQuL4AavoxfSDtvo0ad30X2fK1WKeeBtgiT4UzV6ZGZh5igKQHM4lVvmbo/jOeQD0KAod7pRe/h4FBFmCVIWwgW+I+Hnzp8A/nJezoowJ3jiTt0FodC9uBCT64ZCz5dVCryD62LDVjKBxB7cfIoQA+PxCiXr9QQKBgQD+2v38J/MlfK/XCYldclzumizwIw6T0Mv6XvYwXQHYgYDKYNF6k1LhMEUo7fP3EsPdV8h/nXmdU4qadOVm6QSJ/rGEl22yGlO7woUzTY/Ls9eknoqfMYuyI1+ICMnNxmesQbWyc0cOHh44cEF+icfJxEDAmrHGLmBVsKuLUJUuVQKBgQCGt663TF7mixghiUOcT11zC1fqG+dIcvAwHpCHfdxsniYRqnv+SLf6eC5PCkQ5aNAAl/ywOLQAWS0XgYti3LyZ4iuGIYcUE0IDDmhWl68V27iXcLIK+rBRqBGxSdk8xR+zSE8fpO4mXpxn8SH0Butex8PJ+oHTbmdXIUAXdn6HGQKBgQCvAB1rqtsRoL72ADxtCHy78u5srwXxhmyqrc6LgzIjQzn2vejaLJO6wfSbmFnwDNimAwNQbgf2ekkwqphjxBozz8qB66GNrPpWccoZYmcdT48CIUO68MCmQBf3R2GbhWPnKu/ja7kc/p1tz9eJVn70E2kLWK4+EdZgwQHqlhj6SQKBgF4AmbdpYOb5s9Li1vyhHJIEHkpLQi15lkPdb/g7SK26BNJa5b5fu5DYf2fDwCtXCZ0AcN/+EQwVLbOzPzGy2R9/g+NKTdkiPvOnAAM8QH2+HaX+ix3CI3o3DnFpGF6hJieRkzR/f3Ximryks451rZMrTWEIncKMzSstFm3Izy0xAoGBAJQaMqlzpM+QaJiytJNeqRpPWRsi0Dkf4XqJXPWLOrApSISsafZF5vk2ZOeIqRsVCBH3LdfVIJxEBAF4l/Sd2q7xC9JHawJDqa4ea7VwL68ANH2w3jcJ3j6DQqf7NIe/lSGxYF6Jt+74oRFHxN3GDSf+z91DYfZz8hQnyphKDNEJ"
+    appId: "2021002156615717"
+    certPath: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt"
+    publicCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt"
+    rootCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt"
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/EtOrderMappingMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/EtOrderMappingMapper.xml
similarity index 54%
rename from xhpc-modules/xhpc-tradebill/src/main/resources/mapper/EtOrderMappingMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/EtOrderMappingMapper.xml
index def2aa53..ebb8e88d 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/EtOrderMappingMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/EtOrderMappingMapper.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.tradebill.mapper.EtOrderMappingMapper">
+<mapper namespace="com.xhpc.activity.mapper.EtOrderMappingMapper">
 
 
-    <select id="selectByXhOrderNo" resultType="com.xhpc.tradebill.domain.EtOrderMappingDomain">
+    <select id="selectByXhOrderNo" resultType="com.xhpc.activity.domain.EtOrderMappingDomain">
         select  * from et_order_mapping where xh_order_no = #{xhOrderNo}
     </select>
 
-    <select id="selectByEvcsOrderNo" resultType="com.xhpc.tradebill.domain.EtOrderMappingDomain">
+    <select id="selectByEvcsOrderNo" resultType="com.xhpc.activity.domain.EtOrderMappingDomain">
         select  * from et_order_mapping where evcs_order_no = #{evcsOrderNo}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/SysOperLogMapper.xml
similarity index 94%
rename from xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/SysOperLogMapper.xml
index fd2e2dd3..fc180b50 100644
--- a/xhpc-modules/xhpc-log/src/main/resources/mapper/SysOperLogMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/SysOperLogMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.log.mapper.SysOperLogMapper">
+<mapper namespace="com.xhpc.activity.mapper.SysOperLogMapper">
 
     <select id="selectUserOperLog" resultType="map">
         select
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargeOrderMapper.xml
similarity index 65%
rename from xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcChargeOrderMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargeOrderMapper.xml
index c0aaecf5..06c425a5 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcChargeOrderMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargeOrderMapper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.tradebill.mapper.XhpcChargeOrderMapper">
+<mapper namespace="com.xhpc.activity.mapper.XhpcChargeOrderMapper">
 
 </mapper>
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingPileMapper.xml
similarity index 99%
rename from xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingPileMapper.xml
index b9db0969..75f9772f 100644
--- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingPileMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingPileMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.log.mapper.XhpcChargingPileMapper">
+<mapper namespace="com.xhpc.activity.mapper.XhpcChargingPileMapper">
 
     <resultMap id="BaseResultMap" type="com.xhpc.common.domain.XhpcChargingPile">
         <result property="chargingPileId" column="charging_pile_id"/>
diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingStationMapper.xml
similarity index 97%
rename from xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingStationMapper.xml
index f787a006..d38a99d5 100644
--- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcChargingStationMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.log.mapper.XhpcChargingStationMapper">
+<mapper namespace="com.xhpc.activity.mapper.XhpcChargingStationMapper">
 
     <select id="selectXhpcChargingStationList" resultType="java.util.Map">
         select
diff --git a/xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingBankMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingBankMapper.xml
similarity index 92%
rename from xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingBankMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingBankMapper.xml
index 8194f497..7a7afc51 100644
--- a/xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingBankMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingBankMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.clearing.mapper.XhpcClearingBankMapper">
-    <resultMap id="BaseResultMap" type="com.xhpc.clearing.domain.XhpcClearingBankDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcClearingBankMapper">
+    <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcClearingBankDomain">
         <id column="clearing_bank_id" jdbcType="BIGINT" property="clearingBankId"/>
         <result column="operator_id" jdbcType="BIGINT" property="operatorId"/>
         <result column="operator_name" jdbcType="VARCHAR" property="operatorName"/>
@@ -44,7 +44,7 @@
     </select>
 
 
-    <select id="selectByParams" resultType="com.xhpc.clearing.domain.XhpcClearingBankDomain">
+    <select id="selectByParams" resultType="com.xhpc.activity.domain.XhpcClearingBankDomain">
         select
         <include refid="Base_Column_List"/>
         from xhpc_clearing_bank
@@ -61,7 +61,7 @@
     </select>
 
 
-    <select id="selectOneByOperatorId" resultType="com.xhpc.clearing.domain.XhpcClearingBankDomain">
+    <select id="selectOneByOperatorId" resultType="com.xhpc.activity.domain.XhpcClearingBankDomain">
         select
         <include refid="Base_Column_List"/>
         from xhpc_clearing_bank
@@ -95,7 +95,7 @@
 
 
     <insert id="insert" keyColumn="clearing_bank_id" keyProperty="clearingBankId"
-            parameterType="com.xhpc.clearing.domain.XhpcClearingBankDomain" useGeneratedKeys="true">
+            parameterType="com.xhpc.activity.domain.XhpcClearingBankDomain" useGeneratedKeys="true">
         insert into xhpc_clearing_bank (operator_id, operator_name, area_code,
                                         bank_name, operator_account, bank_no,
                                         address, contact_name, contact_phone,
@@ -111,7 +111,7 @@
     </insert>
 
 
-    <update id="updateByPrimaryKey" parameterType="com.xhpc.clearing.domain.XhpcClearingBankDomain">
+    <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcClearingBankDomain">
         update xhpc_clearing_bank
         set operator_id      = #{operatorId,jdbcType=BIGINT},
             operator_name    = #{operatorName,jdbcType=VARCHAR},
diff --git a/xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml
similarity index 93%
rename from xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml
index 35bf5edf..ec877b03 100644
--- a/xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingCheckoutMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.clearing.mapper.XhpcClearingCheckoutMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.clearing.domain.XhpcClearingCheckoutDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcClearingCheckoutMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcClearingCheckoutDomain">
     <id column="clearing_checkout_id" jdbcType="BIGINT" property="clearingCheckoutId" />
     <result column="clearing_bank_id" jdbcType="BIGINT" property="clearingBankId" />
     <result column="apply_amount" jdbcType="DECIMAL" property="applyAmount" />
@@ -25,7 +25,7 @@
   </sql>
 
 
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultType="com.xhpc.clearing.domain.XhpcClearingCheckoutDomain">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultType="com.xhpc.activity.domain.XhpcClearingCheckoutDomain">
     select 
     <include refid="Base_Column_List" />, xo.name as 'operator_name'
     from xhpc_clearing_checkout cc
@@ -35,7 +35,7 @@
 
 
 
-  <select id="selectByParams" resultType="com.xhpc.clearing.domain.XhpcClearingCheckoutDomain">
+  <select id="selectByParams" resultType="com.xhpc.activity.domain.XhpcClearingCheckoutDomain">
     select
     <include refid="Base_Column_List" />, xo.name as 'operator_name'
     from xhpc_clearing_checkout cc
@@ -64,7 +64,7 @@
     </select>
 
 
-  <select id="selectOrderMapByCheckoutIds" resultType="com.xhpc.clearing.vo.CheckoutBankVo">
+  <select id="selectOrderMapByCheckoutIds" resultType="com.xhpc.activity.vo.CheckoutBankVo">
     select
         'RMB' as 'curreyType',
         date_format(now(), '%Y%m%d') as 'date',
@@ -105,7 +105,7 @@
   </delete>
 
 
-  <insert id="insert" keyColumn="clearing_checkout_id" keyProperty="clearingCheckoutId" parameterType="com.xhpc.clearing.domain.XhpcClearingCheckoutDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="clearing_checkout_id" keyProperty="clearingCheckoutId" parameterType="com.xhpc.activity.domain.XhpcClearingCheckoutDomain" useGeneratedKeys="true">
     insert into xhpc_clearing_checkout (clearing_bank_id, apply_amount, handling_fee, bank_fee,
       received_amount, del_flag, `status`, operator_id, tenant_id,
       create_by, create_time,
@@ -117,7 +117,7 @@
   </insert>
 
 
-  <update id="updateByPrimaryKey" parameterType="com.xhpc.clearing.domain.XhpcClearingCheckoutDomain">
+  <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcClearingCheckoutDomain">
     update xhpc_clearing_checkout
     set clearing_bank_id = #{clearingBankId,jdbcType=BIGINT},
       apply_amount = #{applyAmount,jdbcType=DECIMAL},
diff --git a/xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
similarity index 98%
rename from xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
index 4a6b5f37..c0628d62 100644
--- a/xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingHistoryOrderMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.clearing.mapper.XhpcClearingHistoryOrderMapper">
-    <resultMap id="BaseResultMap" type="com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcClearingHistoryOrderMapper">
+    <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain">
         <id column="clearing_order_id" jdbcType="BIGINT" property="clearingOrderId"/>
         <result column="charging_station_id" jdbcType="BIGINT" property="chargingStationId"/>
         <result column="charge_order_id" jdbcType="BIGINT" property="chargeOrderId"/>
@@ -103,7 +103,7 @@
 
 
     <select id="selectOrderListByOperator"
-            resultType="com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain">
+            resultType="com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain">
         select
             <include refid="Base_Column_List"/>
         from xhpc_clearing_history_order as ho
@@ -160,7 +160,7 @@
     </select>
 
 
-    <select id="getListPage" resultType="com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain">
+    <select id="getListPage" resultType="com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain">
         select
         <include refid="Base_Column_List" />,
         ct.name as 'station_name',
@@ -302,7 +302,7 @@
 
 
     <insert id="insert" keyColumn="clearing_order_id" keyProperty="clearingOrderId"
-            parameterType="com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain" useGeneratedKeys="true">
+            parameterType="com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain" useGeneratedKeys="true">
         insert into xhpc_clearing_history_order (charging_station_id, charge_order_id, user_id,
                                                  terminal_id, serial_number, internet_serial_number,
                                                  power_price_total, service_price_total, total_price,
@@ -351,7 +351,7 @@
     </insert>
 
 
-    <update id="updateByPrimaryKey" parameterType="com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain">
+    <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain">
         update xhpc_clearing_history_order
         set charging_station_id        = #{chargingStationId,jdbcType=BIGINT},
             charge_order_id            = #{chargeOrderId,jdbcType=BIGINT},
diff --git a/xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingReceiptMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingReceiptMapper.xml
similarity index 91%
rename from xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingReceiptMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingReceiptMapper.xml
index 2db30350..6036ad57 100644
--- a/xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcClearingReceiptMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcClearingReceiptMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.clearing.mapper.XhpcClearingReceiptMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.clearing.domain.XhpcClearingReceiptDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcClearingReceiptMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcClearingReceiptDomain">
     <id column="clearing_receipt_id" jdbcType="BIGINT" property="clearingReceiptId" />
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -24,7 +24,7 @@
 
 
 
-  <insert id="insert" keyColumn="clearing_receipt_id" keyProperty="clearingReceiptId" parameterType="com.xhpc.clearing.domain.XhpcClearingReceiptDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="clearing_receipt_id" keyProperty="clearingReceiptId" parameterType="com.xhpc.activity.domain.XhpcClearingReceiptDomain" useGeneratedKeys="true">
     insert into xhpc_clearing_receipt (`type`, `name`, url, 
       clearing_checkout_ids, create_time, create_by
       )
diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
similarity index 98%
rename from xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
index 0c61affd..f79c240d 100644
--- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcDeviceMessageMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.log.mapper.XhpcDeviceMessageMapper">
+<mapper namespace="com.xhpc.activity.mapper.XhpcDeviceMessageMapper">
 
 
     <delete id="deleteMessageByDate">
diff --git a/xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
similarity index 63%
rename from xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
index 2f9a100f..0d3b19ae 100644
--- a/xhpc-modules/xhpc-clearing/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.clearing.mapper.XhpcHistoryOrderMapper">
+<mapper namespace="com.xhpc.activity.mapper.XhpcHistoryOrderMapper">
 
     <resultMap type="com.xhpc.order.domain.XhpcHistoryOrder" id="XhpcHistoryOrderResult">
         <id column="history_order_id" jdbcType="BIGINT" property="historyOrderId" />
@@ -74,7 +74,7 @@
     </sql>
     
     
-    <select id="selectUnsyncOrderList" resultType="com.xhpc.clearing.domain.XhpcHistoryOrderDomain">
+    <select id="selectUnsyncOrderList" resultType="com.xhpc.activity.domain.XhpcHistoryOrderDomain">
         select
         <include refid="Base_Column_List" />,
         op.operator_id,
@@ -103,4 +103,96 @@
             #{item}
         </foreach>
     </update>
+
+
+    <select id="getOrderPage" resultType="map">
+        select
+        co.serial_number as 'serialNumber',
+        co.source as 'source',
+        case co.source when 0 then 'C端用户'
+        when 1 then '流量方用户'
+        when 2 then '社区用户'
+        when 3 then 'B端用户' end  as 'sourceName',
+        replace(co.start_time, 'T', ' ')  as 'startTime',
+        replace(co.end_time, 'T', ' ') as 'endTime'
+        from xhpc_charge_order as co
+        left join xhpc_charging_station as st on st.charging_station_id =co.charging_station_id
+        where co.del_flag =0
+        <if test="params.orderId!=null and params.orderId!=''">
+            and co.serial_number like concat('%', #{params.orderId},'%')
+        </if>
+        <if test="params.number !=0 and params.number ==1">
+            and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId})
+        </if>
+        <if test="params.number !=0 and params.number ==2">
+            and co.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.operatorId})
+        </if>
+        <if test="params.tenantId != null and params.tenantId != ''">
+            and co.tenant_id = #{params.tenantId}
+        </if>
+        <if test="params.startTime!=null and params.startTime!=''">
+            and co.start_time <![CDATA[ >=  ]]> #{params.startTime}
+        </if>
+        <if test="params.endTime !=null and params.endTime!=''">
+            and co.create_time <![CDATA[ <=  ]]> #{params.endTime}
+        </if>
+
+        order by co.create_time desc
+    </select>
+
+
+    <select id="findOneBySerialNumber" resultType="com.xhpc.activity.domain.XhpcHistoryOrderDomain">
+        select
+            o.*,
+            s.name as 'charging_station_name'
+        from
+            xhpc_history_order o
+                left join xhpc_charging_station s on o.charging_station_id=s.charging_station_id
+        where serial_number=#{serialNumber}
+    </select>
+
+    <select id="findOneByInternetSerialNumber" resultType="com.xhpc.activity.domain.XhpcHistoryOrderDomain">
+        select
+            o.*,
+            s.name as 'charging_station_name',
+                c.charging_degree as 'charging_degree',
+                c.charging_time as 'charging_time'
+        from xhpc_history_order o
+                 left join xhpc_charging_station s on o.charging_station_id=s.charging_station_id
+                 left join xhpc_charge_order c on o.charge_order_id=c.charge_order_id
+        where o.internet_serial_number=#{internetSerialNumber}
+    </select>
+
+    <select id="findListByInternetSerialNumbers" resultType="com.xhpc.activity.domain.XhpcHistoryOrderDomain">
+        select
+        o.*,
+        s.name as 'charging_station_name',
+        c.charging_degree as 'charging_degree',
+        c.charging_time as 'charging_time'
+        from xhpc_history_order o
+        left join xhpc_charging_station s on o.charging_station_id=s.charging_station_id
+        left join xhpc_charge_order c on o.charge_order_id=c.charge_order_id
+        where o.internet_serial_number in
+        <foreach collection="orderNumbers" item="orderNumber" open="(" close=")" separator=",">
+            #{orderNumber}
+        </foreach>
+    </select>
+
+    <select id="findListByTimeBetween" resultType="com.xhpc.activity.domain.XhpcHistoryOrderDomain">
+        select
+        o.*,
+        s.name as 'charging_station_name',
+        c.charging_degree as 'charging_degree',
+        c.charging_time as 'charging_time'
+        from xhpc_history_order o
+        left join xhpc_charging_station s on o.charging_station_id=s.charging_station_id
+        left join xhpc_charge_order c on o.charge_order_id=c.charge_order_id
+        where o.tenant_id=#{tenantId}
+        <if test="startTime!=null and startTime != ''">
+            and o.create_time <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime !=''">
+            and o.create_time <![CDATA[ <= ]]> #{endTime}
+        </if>
+    </select>
 </mapper>
diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcMessageMapper.xml
similarity index 97%
rename from xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcMessageMapper.xml
index a5c6585e..e3926544 100644
--- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcMessageMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcMessageMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.log.mapper.XhpcMessageMapper">
+<mapper namespace="com.xhpc.activity.mapper.XhpcMessageMapper">
 
     <select id="getOrderMessagePage" resultType="map">
         select m.message_id as 'messageId', m.charge_order_no as 'chargeOrderNo', m.content as 'content', m.status as 'status', m.remark as 'remark', m.create_time as 'createTime'
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcRechargeOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
similarity index 88%
rename from xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
index c9787151..84bef85c 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.tradebill.mapper.XhpcRechargeOrderMapper">
+<mapper namespace="com.xhpc.activity.mapper.XhpcRechargeOrderMapper">
 
 
-    <resultMap type="com.xhpc.tradebill.domain.XhpcRechargeOrderDomain" id="XhpcRechargeOrderResult">
+    <resultMap type="com.xhpc.activity.domain.XhpcRechargeOrderDomain" id="XhpcRechargeOrderResult">
         <result column="recharge_order_id" property="rechargeOrderId" />
         <result column="user_id" property="userId" />
         <result column="recharge_order_number" property="rechargeOrderNumber"/>
@@ -21,7 +21,7 @@
     </resultMap>
 
 
-    <select id="findOneByOrderNumber" resultType="com.xhpc.tradebill.domain.XhpcRechargeOrderDomain">
+    <select id="findOneByOrderNumber" resultType="com.xhpc.activity.domain.XhpcRechargeOrderDomain">
         select
         *
         from xhpc_recharge_order
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcRefundOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcRefundOrderMapper.xml
similarity index 89%
rename from xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcRefundOrderMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcRefundOrderMapper.xml
index 7604985d..4b14426d 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcRefundOrderMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcRefundOrderMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.tradebill.mapper.XhpcRefundOrderMapper">
+<mapper namespace="com.xhpc.activity.mapper.XhpcRefundOrderMapper">
 
 
-    <resultMap type="com.xhpc.tradebill.domain.XhpcRefundOrderDomain" id="XhpcRefundOrderResult">
+    <resultMap type="com.xhpc.activity.domain.XhpcRefundOrderDomain" id="XhpcRefundOrderResult">
         <result column="refund_order_id" property="refundOrderId"/>
         <result column="refund_order_number" property="refundOrderNumber"/>
         <result column="user_id" property="userId"/>
@@ -21,7 +21,7 @@
         <result column="source" property="source" />
     </resultMap>
 
-    <select id="findByOrderNumber" resultType="com.xhpc.tradebill.domain.XhpcRefundOrderDomain">
+    <select id="findByOrderNumber" resultType="com.xhpc.activity.domain.XhpcRefundOrderDomain">
         select * from xhpc_refund_order where refund_order_number=#{orderNumber}
     </select>
 
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcStationDeviceMapper.xml
similarity index 95%
rename from xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcStationDeviceMapper.xml
index 1344c51a..5b431eb4 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcStationDeviceMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.workorder.mapper.XhpcStationDeviceMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.workorder.domain.XhpcStationDeviceDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcStationDeviceMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcStationDeviceDomain">
     <id column="device_id" jdbcType="BIGINT" property="deviceId" />
     <result column="device_name" jdbcType="VARCHAR" property="deviceName" />
     <result column="device_type" jdbcType="VARCHAR" property="deviceType" />
@@ -22,7 +22,7 @@
     `status`, del_flag, create_time, create_by, update_time, update_by
   </sql>
 
-  <select id="selectStationGunDeviceBySerialNumber" resultType="com.xhpc.workorder.domain.XhpcStationDeviceDomain">
+  <select id="selectStationGunDeviceBySerialNumber" resultType="com.xhpc.activity.domain.XhpcStationDeviceDomain">
     select
     <include refid="Base_Column_List" />
     from xhpc_station_device
@@ -199,7 +199,7 @@
     update xhpc_station_device set del_flag = 2
     where device_id = #{deviceId,jdbcType=INTEGER}
   </update>
-  <insert id="insert" keyColumn="device_id" keyProperty="deviceId" parameterType="com.xhpc.workorder.domain.XhpcStationDeviceDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="device_id" keyProperty="deviceId" parameterType="com.xhpc.activity.domain.XhpcStationDeviceDomain" useGeneratedKeys="true">
     insert into xhpc_station_device (device_name, device_type, current_type, station_id,
       parent_device_id, serial_number, brand_model,sorted, `status`,
       del_flag, create_time, create_by, 
@@ -208,7 +208,7 @@
       #{parentDeviceId,jdbcType=BIGINT}, #{serialNumber,jdbcType=VARCHAR}, #{brandModel,jdbcType=VARCHAR},#{sorted, jdbcType=SMALLINT}, #{status,jdbcType=SMALLINT},
       0, SYSDATE(), #{createBy,jdbcType=VARCHAR}, SYSDATE(), #{updateBy,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" keyColumn="device_id" keyProperty="deviceId" parameterType="com.xhpc.workorder.domain.XhpcStationDeviceDomain" useGeneratedKeys="true">
+  <insert id="insertSelective" keyColumn="device_id" keyProperty="deviceId" parameterType="com.xhpc.activity.domain.XhpcStationDeviceDomain" useGeneratedKeys="true">
     insert into xhpc_station_device
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="deviceName != null">
@@ -287,7 +287,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.workorder.domain.XhpcStationDeviceDomain">
+  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.activity.domain.XhpcStationDeviceDomain">
     update xhpc_station_device
     <set>
       <if test="deviceName != null">
@@ -324,7 +324,7 @@
     </set>
     where device_id = #{deviceId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.xhpc.workorder.domain.XhpcStationDeviceDomain">
+  <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcStationDeviceDomain">
     update xhpc_station_device
     set device_name = #{deviceName,jdbcType=VARCHAR},
       device_type = #{deviceType,jdbcType=VARCHAR},
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml
similarity index 96%
rename from xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml
index 93396977..9ff01629 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillInternetCheckRecordMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.tradebill.mapper.XhpcTradebillInternetCheckRecordMapper">
-    <resultMap id="BaseResultMap" type="com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcTradebillInternetCheckRecordMapper">
+    <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain">
         <id column="id" jdbcType="INTEGER" property="id"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="create_by" jdbcType="BIGINT" property="createBy"/>
@@ -71,7 +71,7 @@
         </where>
     </select>
 
-    <select id="selectListByParams" resultType="com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain">
+    <select id="selectListByParams" resultType="com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain">
         select
         p.*, cu.user_name as 'create_name', uu.user_name as 'update_name',
         case when p.status=0 then '未对账' when p.status=1 then '对账错误' when p.status=2 then '对账正确' else '未知' end as
@@ -135,7 +135,7 @@
         where id = #{id}
     </delete>
     <insert id="insert" keyColumn="id" keyProperty="id"
-            parameterType="com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain" useGeneratedKeys="true">
+            parameterType="com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain" useGeneratedKeys="true">
         insert into xhpc_tradebill_internet_check_record (create_time, create_by, update_time,
                                                           update_by, upload_id, history_order_no,
                                                           user_id, internet_name, platform_internet_serial_number,
@@ -176,7 +176,7 @@
     </insert>
 
     <insert id="insertCheckList" keyColumn="id" keyProperty="id"
-            parameterType="com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain" useGeneratedKeys="true">
+            parameterType="com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain" useGeneratedKeys="true">
         insert into xhpc_tradebill_internet_check_record (create_time, create_by, update_time,
         update_by, upload_id, history_order_no,
         user_id, internet_name, platform_internet_serial_number, platform_serial_number,
@@ -220,7 +220,7 @@
 
 
     <insert id="insertSelective" keyColumn="id" keyProperty="id"
-            parameterType="com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain" useGeneratedKeys="true">
+            parameterType="com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain" useGeneratedKeys="true">
         insert into xhpc_tradebill_internet_check_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             create_time,
@@ -436,7 +436,7 @@
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective"
-            parameterType="com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain">
+            parameterType="com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain">
         update xhpc_tradebill_internet_check_record
         <set>
             update_time = now(),
@@ -542,7 +542,7 @@
         </set>
         where id = #{id}
     </update>
-    <update id="updateByPrimaryKey" parameterType="com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain">
+    <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain">
         update xhpc_tradebill_internet_check_record
         set update_time                     = now(),
             update_by                       = #{updateBy},
@@ -582,7 +582,7 @@
     </update>
 
 
-    <update id="updateStatusByPk" parameterType="com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain">
+    <update id="updateStatusByPk" parameterType="com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain">
         update xhpc_tradebill_internet_check_record
         set update_time = now(),
             update_by   = #{updateBy},
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillPaymentCheckRecordMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillPaymentCheckRecordMapper.xml
similarity index 93%
rename from xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillPaymentCheckRecordMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillPaymentCheckRecordMapper.xml
index 312edeb1..06d98d4c 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillPaymentCheckRecordMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillPaymentCheckRecordMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.tradebill.mapper.XhpcTradebillPaymentCheckRecordMapper">
-    <resultMap id="BaseResultMap" type="com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcTradebillPaymentCheckRecordMapper">
+    <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain">
         <id column="id" jdbcType="INTEGER" property="id"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="create_by" jdbcType="BIGINT" property="createBy"/>
@@ -55,7 +55,7 @@
         </where>
     </select>
     <select id="selectListByParams"
-            resultType="com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain">
+            resultType="com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain">
         select
         p.*, cu.user_name as 'create_name', uu.user_name as 'update_name',
         case when p.status=0 then '未对账' when p.status=1 then '对账错误' when p.status=2 then '对账正确' else '未知' end as
@@ -110,7 +110,7 @@
     </delete>
 
     <insert id="insert" keyColumn="id" keyProperty="id"
-            parameterType="com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain" useGeneratedKeys="true">
+            parameterType="com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain" useGeneratedKeys="true">
         insert into xhpc_tradebill_payment_check_record (create_time, create_by, update_time,
                                                          update_by, upload_id, order_type,
                                                          payment_channel, platform_order_number, platform_pay_number,
@@ -129,7 +129,7 @@
     </insert>
 
     <insert id="insertCheckList" keyColumn="id" keyProperty="id"
-            parameterType="com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain" useGeneratedKeys="true">
+            parameterType="com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain" useGeneratedKeys="true">
         insert into xhpc_tradebill_payment_check_record (create_time, create_by, update_time,
         update_by, upload_id, order_type,
         payment_channel, platform_order_number, platform_pay_number,
@@ -155,7 +155,7 @@
 
 
     <insert id="insertSelective" keyColumn="id" keyProperty="id"
-            parameterType="com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain" useGeneratedKeys="true">
+            parameterType="com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain" useGeneratedKeys="true">
         insert into xhpc_tradebill_payment_check_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             create_time,
@@ -263,7 +263,7 @@
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective"
-            parameterType="com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain">
+            parameterType="com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain">
         update xhpc_tradebill_payment_check_record
         <set>
             update_time = now(),
@@ -315,7 +315,7 @@
         </set>
         where id = #{id}
     </update>
-    <update id="updateByPrimaryKey" parameterType="com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain">
+    <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain">
         update xhpc_tradebill_payment_check_record
         set update_time           = now(),
             update_by             = #{updateBy},
@@ -336,7 +336,7 @@
         where id = #{id}
     </update>
 
-    <update id="updateStatusByPk" parameterType="com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain">
+    <update id="updateStatusByPk" parameterType="com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain">
         update xhpc_tradebill_payment_check_record
         set update_time = now(),
             update_by   = #{updateBy},
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillUploadRecordMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillUploadRecordMapper.xml
similarity index 92%
rename from xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillUploadRecordMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillUploadRecordMapper.xml
index 75cfec26..9405c533 100644
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcTradebillUploadRecordMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcTradebillUploadRecordMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.tradebill.mapper.XhpcTradebillUploadRecordMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcTradebillUploadRecordMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain">
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
@@ -32,7 +32,7 @@
     where url = #{url,jdbcType=VARCHAR}
   </select>
 
-  <select id="selectByType" resultType="com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain">
+  <select id="selectByType" resultType="com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain">
     select
     <include refid="Base_Column_List" />
     from xhpc_tradebill_upload_record
@@ -58,7 +58,7 @@
     delete from xhpc_tradebill_upload_record
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain" useGeneratedKeys="true">
     insert into xhpc_tradebill_upload_record (create_time, create_by, update_time,
                                               update_by, `source`, file_name,
                                               url, `type`, `status`,
@@ -70,7 +70,7 @@
             #{delFlag,jdbcType=SMALLINT}, #{successCount,jdbcType=INTEGER}, #{failCount,jdbcType=INTEGER},
             #{uncheckCount,jdbcType=INTEGER}, #{checkedCount,jdbcType=INTEGER}, #{tenantId, jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain" useGeneratedKeys="true">
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain" useGeneratedKeys="true">
     insert into xhpc_tradebill_upload_record
     <trim prefix="(" suffix=")" suffixOverrides=",">
         create_time,
@@ -159,7 +159,7 @@
         </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain">
+  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain">
     update xhpc_tradebill_upload_record
     <set>
         update_time = now(),
@@ -199,7 +199,7 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain">
+  <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain">
     update xhpc_tradebill_upload_record
     set update_time = now(),
         update_by = #{updateBy,jdbcType=VARCHAR},
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkDeptMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml
similarity index 90%
rename from xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkDeptMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml
index 1bd86675..e1d2cea7 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkDeptMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkDeptMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.workorder.mapper.XhpcWorkDeptMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.workorder.domain.XhpcWorkDeptDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcWorkDeptMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcWorkDeptDomain">
     <id column="work_dept_id" jdbcType="BIGINT" property="workDeptId" />
     <result column="dept_name" jdbcType="VARCHAR" property="deptName" />
     <result column="code" jdbcType="VARCHAR" property="code" />
@@ -20,7 +20,7 @@
     create_time, create_by, update_time, update_by
   </sql>
 
-  <select id="selectListByParams" resultType="com.xhpc.workorder.domain.XhpcWorkDeptDomain">
+  <select id="selectListByParams" resultType="com.xhpc.activity.domain.XhpcWorkDeptDomain">
     select
     <include refid="Base_Column_List" />
     from xhpc_work_dept
@@ -51,7 +51,7 @@
     update xhpc_work_dept set del_flag=2
     where work_dept_id = #{workDeptId,jdbcType=BIGINT}
   </update>
-  <insert id="insert" keyColumn="work_dept_id" keyProperty="workDeptId" parameterType="com.xhpc.workorder.domain.XhpcWorkDeptDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="work_dept_id" keyProperty="workDeptId" parameterType="com.xhpc.activity.domain.XhpcWorkDeptDomain" useGeneratedKeys="true">
     insert into xhpc_work_dept (dept_name, code, sort, 
       parent_dept_id, `status`, del_flag, 
       tenant_id, create_time, create_by, 
@@ -61,7 +61,7 @@
       #{tenantId,jdbcType=VARCHAR}, SYSDATE(), #{createBy,jdbcType=VARCHAR},
       SYSDATE(), #{updateBy,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" keyColumn="work_dept_id" keyProperty="workDeptId" parameterType="com.xhpc.workorder.domain.XhpcWorkDeptDomain" useGeneratedKeys="true">
+  <insert id="insertSelective" keyColumn="work_dept_id" keyProperty="workDeptId" parameterType="com.xhpc.activity.domain.XhpcWorkDeptDomain" useGeneratedKeys="true">
     insert into xhpc_work_dept
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="deptName != null">
@@ -122,7 +122,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.workorder.domain.XhpcWorkDeptDomain">
+  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.activity.domain.XhpcWorkDeptDomain">
     update xhpc_work_dept
     <set>
       <if test="deptName != null">
@@ -150,7 +150,7 @@
     </set>
     where work_dept_id = #{workDeptId,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.xhpc.workorder.domain.XhpcWorkDeptDomain">
+  <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcWorkDeptDomain">
     update xhpc_work_dept
     set dept_name = #{deptName,jdbcType=VARCHAR},
       code = #{code,jdbcType=VARCHAR},
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderImageMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderImageMapper.xml
similarity index 86%
rename from xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderImageMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderImageMapper.xml
index 7040e247..5629c5b7 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderImageMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderImageMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.workorder.mapper.XhpcWorkOrderImageMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.workorder.domain.XhpcWorkOrderImageDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcWorkOrderImageMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcWorkOrderImageDomain">
     <id column="order_image_id" jdbcType="BIGINT" property="orderImageId" />
     <result column="order_id" jdbcType="BIGINT" property="orderId"/>
     <result column="file_name" jdbcType="VARCHAR" property="fileName" />
@@ -30,7 +30,7 @@
     </foreach>
   </delete>
 
-  <select id="selectByOrderIdAndType" resultType="com.xhpc.workorder.domain.XhpcWorkOrderImageDomain">
+  <select id="selectByOrderIdAndType" resultType="com.xhpc.activity.domain.XhpcWorkOrderImageDomain">
     select
     <include refid="Base_Column_List" />
     from xhpc_work_order_image
@@ -47,7 +47,7 @@
     update xhpc_work_order_image set del_flag=2
     where order_image_id = #{orderImageId,jdbcType=BIGINT}
   </update>
-  <insert id="insert" keyColumn="order_image_id" keyProperty="orderImageId" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderImageDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="order_image_id" keyProperty="orderImageId" parameterType="com.xhpc.activity.domain.XhpcWorkOrderImageDomain" useGeneratedKeys="true">
     insert into xhpc_work_order_image (file_name, url, `type`, 
       del_flag, create_time, create_by
       )
@@ -55,7 +55,7 @@
       0, SYSDATE(), #{createBy,jdbcType=VARCHAR}
       )
   </insert>
-  <insert id="insertSelective" keyColumn="order_image_id" keyProperty="orderImageId" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderImageDomain" useGeneratedKeys="true">
+  <insert id="insertSelective" keyColumn="order_image_id" keyProperty="orderImageId" parameterType="com.xhpc.activity.domain.XhpcWorkOrderImageDomain" useGeneratedKeys="true">
     insert into xhpc_work_order_image
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="orderId != null">
@@ -96,7 +96,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderImageDomain">
+  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.activity.domain.XhpcWorkOrderImageDomain">
     update xhpc_work_order_image
     <set>
         <if test="orderId !=null">
@@ -118,7 +118,7 @@
     </set>
     where order_image_id = #{orderImageId,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderImageDomain">
+  <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcWorkOrderImageDomain">
     update xhpc_work_order_image
     set order_id=#{orderId},
         file_name = #{fileName,jdbcType=VARCHAR},
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml
similarity index 92%
rename from xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml
index 4462bdca..40b4b321 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.workorder.mapper.XhpcWorkOrderMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.workorder.domain.XhpcWorkOrderDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcWorkOrderMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcWorkOrderDomain">
     <id column="work_order_id" jdbcType="BIGINT" property="workOrderId" />
     <result column="type" jdbcType="SMALLINT" property="type" />
     <result column="title" jdbcType="VARCHAR" property="title" />
@@ -37,7 +37,7 @@
   </insert>
 
 
-  <select id="selectByTypeAndTitle" resultType="com.xhpc.workorder.domain.XhpcWorkOrderDomain">
+  <select id="selectByTypeAndTitle" resultType="com.xhpc.activity.domain.XhpcWorkOrderDomain">
     select
     <include refid="Base_Column_List" />
     from xhpc_work_order o
@@ -79,7 +79,7 @@
   </select>
 
 
-  <select id="selectByPrimaryKey" resultType="com.xhpc.workorder.domain.XhpcWorkOrderDomain">
+  <select id="selectByPrimaryKey" resultType="com.xhpc.activity.domain.XhpcWorkOrderDomain">
     select 
     <include refid="Base_Column_List" />,
     d.device_name, s.name, co.start_time, co.source, td.name as 'type_name'
@@ -94,7 +94,7 @@
     update xhpc_work_order set del_flag=2
     where work_order_id = #{workOrderId,jdbcType=BIGINT}
   </update>
-  <insert id="insert" keyColumn="work_order_id" keyProperty="workOrderId" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="work_order_id" keyProperty="workOrderId" parameterType="com.xhpc.activity.domain.XhpcWorkOrderDomain" useGeneratedKeys="true">
     insert into xhpc_work_order (`type`, title, content, fault_time
       device_type, serial_number, reason, disposal_method,
       `status`, del_flag, tenant_id, 
@@ -107,7 +107,7 @@
       sysdate(), #{createBy,jdbcType=VARCHAR},sysdate(),
       #{updateBy,jdbcType=VARCHAR}, #{remark})
   </insert>
-  <insert id="insertSelective" keyColumn="work_order_id" keyProperty="workOrderId" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderDomain" useGeneratedKeys="true">
+  <insert id="insertSelective" keyColumn="work_order_id" keyProperty="workOrderId" parameterType="com.xhpc.activity.domain.XhpcWorkOrderDomain" useGeneratedKeys="true">
     insert into xhpc_work_order
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="type != null">
@@ -194,7 +194,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderDomain">
+  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.activity.domain.XhpcWorkOrderDomain">
     update xhpc_work_order
     <set>
       <if test="type != null">
@@ -237,7 +237,7 @@
     </set>
     where work_order_id = #{workOrderId,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderDomain">
+  <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcWorkOrderDomain">
     update xhpc_work_order
     set `type` = #{type,jdbcType=SMALLINT},
       title = #{title,jdbcType=VARCHAR},
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderPushMessageMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderPushMessageMapper.xml
similarity index 89%
rename from xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderPushMessageMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderPushMessageMapper.xml
index a945d9b4..fd8672e6 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkOrderPushMessageMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkOrderPushMessageMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.workorder.mapper.XhpcWorkOrderPushMessageMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.workorder.domain.XhpcWorkOrderPushMessageDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcWorkOrderPushMessageMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcWorkOrderPushMessageDomain">
     <id column="order_push_id" jdbcType="BIGINT" property="orderPushId" />
     <result column="target" jdbcType="VARCHAR" property="target" />
     <result column="type" jdbcType="SMALLINT" property="type" />
@@ -28,7 +28,7 @@
     delete from xhpc_work_order_push_message
     where order_push_id = #{orderPushId,jdbcType=BIGINT}
   </delete>
-  <insert id="insert" keyColumn="order_push_id" keyProperty="orderPushId" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderPushMessageDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="order_push_id" keyProperty="orderPushId" parameterType="com.xhpc.activity.domain.XhpcWorkOrderPushMessageDomain" useGeneratedKeys="true">
     insert into xhpc_work_order_push_message (target, `type`, content, 
       `status`, fail_msg, remark, 
       create_time, create_by, update_time, 
@@ -38,7 +38,7 @@
       sysdate(), #{createBy,jdbcType=VARCHAR}, sysdate(),
       #{updateBy,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" keyColumn="order_push_id" keyProperty="orderPushId" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderPushMessageDomain" useGeneratedKeys="true">
+  <insert id="insertSelective" keyColumn="order_push_id" keyProperty="orderPushId" parameterType="com.xhpc.activity.domain.XhpcWorkOrderPushMessageDomain" useGeneratedKeys="true">
     insert into xhpc_work_order_push_message
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="target != null">
@@ -93,7 +93,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderPushMessageDomain">
+  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.activity.domain.XhpcWorkOrderPushMessageDomain">
     update xhpc_work_order_push_message
     <set>
       <if test="target != null">
@@ -121,7 +121,7 @@
     </set>
     where order_push_id = #{orderPushId,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.xhpc.workorder.domain.XhpcWorkOrderPushMessageDomain">
+  <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcWorkOrderPushMessageDomain">
     update xhpc_work_order_push_message
     set target = #{target,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=SMALLINT},
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkStationMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkStationMapper.xml
similarity index 95%
rename from xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkStationMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkStationMapper.xml
index 485c54b4..86394c5c 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkStationMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkStationMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.workorder.mapper.XhpcWorkStationMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.workorder.domain.XhpcWorkStationDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcWorkStationMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcWorkStationDomain">
     <id column="work_station_id" jdbcType="BIGINT" property="workStationId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="operator_id" jdbcType="BIGINT" property="operatorId" />
@@ -38,7 +38,7 @@
     park_nums, tenant_id
   </sql>
 
-  <select id="selectListByParams" resultType="com.xhpc.workorder.domain.XhpcWorkStationDomain">
+  <select id="selectListByParams" resultType="com.xhpc.activity.domain.XhpcWorkStationDomain">
     select
     <include refid="Base_Column_List" />
     from xhpc_work_station
@@ -85,7 +85,7 @@
   </select>
 
 
-  <select id="selectByName" resultType="com.xhpc.workorder.domain.XhpcWorkStationDomain">
+  <select id="selectByName" resultType="com.xhpc.activity.domain.XhpcWorkStationDomain">
     select
     <include refid="Base_Column_List" />
     from xhpc_work_station
@@ -102,7 +102,7 @@
     update xhpc_work_station set del_flag=2
     where work_station_id = #{workStationId,jdbcType=BIGINT}
   </update>
-  <insert id="insert" keyColumn="work_station_id" keyProperty="workStationId" parameterType="com.xhpc.workorder.domain.XhpcWorkStationDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="work_station_id" keyProperty="workStationId" parameterType="com.xhpc.activity.domain.XhpcWorkStationDomain" useGeneratedKeys="true">
     insert into xhpc_work_station (`name`, operator_id, `type`, 
       construction_site, service_facilities, periphery_facilities, 
       address, detailed_address, longitude, 
@@ -122,7 +122,7 @@
       #{imgId,jdbcType=VARCHAR}, #{stationType,jdbcType=SMALLINT}, #{serviceTel,jdbcType=VARCHAR}, 
       #{parkNums,jdbcType=INTEGER}, #{tenantId,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" keyColumn="work_station_id" keyProperty="workStationId" parameterType="com.xhpc.workorder.domain.XhpcWorkStationDomain" useGeneratedKeys="true">
+  <insert id="insertSelective" keyColumn="work_station_id" keyProperty="workStationId" parameterType="com.xhpc.activity.domain.XhpcWorkStationDomain" useGeneratedKeys="true">
     insert into xhpc_work_station
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="name != null">
@@ -273,7 +273,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.workorder.domain.XhpcWorkStationDomain">
+  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.activity.domain.XhpcWorkStationDomain">
     update xhpc_work_station
     <set>
       <if test="name != null">
@@ -346,7 +346,7 @@
     </set>
     where work_station_id = #{workStationId,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.xhpc.workorder.domain.XhpcWorkStationDomain">
+  <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcWorkStationDomain">
     update xhpc_work_station
     set `name` = #{name,jdbcType=VARCHAR},
       operator_id = #{operatorId,jdbcType=BIGINT},
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
similarity index 90%
rename from xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
index a4351808..e5e1519b 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkTypeDictMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.workorder.mapper.XhpcWorkTypeDictMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.workorder.domain.XhpcWorkTypeDictDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcWorkTypeDictMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcWorkTypeDictDomain">
     <id column="work_type_id" jdbcType="INTEGER" property="workTypeId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="sort" jdbcType="SMALLINT" property="sort" />
@@ -19,7 +19,7 @@
     create_time, create_by, update_time, update_by
   </sql>
 
-  <select id="selectListByParams" resultType="com.xhpc.workorder.domain.XhpcWorkTypeDictDomain">
+  <select id="selectListByParams" resultType="com.xhpc.activity.domain.XhpcWorkTypeDictDomain">
     select
     <include refid="Base_Column_List" />
     from xhpc_work_type_dict
@@ -79,7 +79,7 @@
     update xhpc_work_type_dict set del_flag=2
     where work_type_id = #{workTypeId,jdbcType=INTEGER}
   </update>
-  <insert id="insert" keyColumn="work_type_id" keyProperty="workTypeId" parameterType="com.xhpc.workorder.domain.XhpcWorkTypeDictDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="work_type_id" keyProperty="workTypeId" parameterType="com.xhpc.activity.domain.XhpcWorkTypeDictDomain" useGeneratedKeys="true">
     insert into xhpc_work_type_dict (name, sort,
       parent_type_id, `status`, del_flag,
       tenant_id, create_time, create_by, 
@@ -89,7 +89,7 @@
       #{tenantId,jdbcType=VARCHAR}, SYSDATE(), #{createBy,jdbcType=VARCHAR},
       SYSDATE(), #{updateBy,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" keyColumn="work_type_id" keyProperty="workTypeId" parameterType="com.xhpc.workorder.domain.XhpcWorkTypeDictDomain" useGeneratedKeys="true">
+  <insert id="insertSelective" keyColumn="work_type_id" keyProperty="workTypeId" parameterType="com.xhpc.activity.domain.XhpcWorkTypeDictDomain" useGeneratedKeys="true">
     insert into xhpc_work_type_dict
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="name != null">
@@ -144,7 +144,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.workorder.domain.XhpcWorkTypeDictDomain">
+  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.activity.domain.XhpcWorkTypeDictDomain">
     update xhpc_work_type_dict
     <set>
       <if test="name != null">
@@ -169,7 +169,7 @@
     </set>
     where work_type_id = #{workTypeId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.xhpc.workorder.domain.XhpcWorkTypeDictDomain">
+  <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcWorkTypeDictDomain">
     update xhpc_work_type_dict
     set name = #{name,jdbcType=VARCHAR},
       sort = #{sort,jdbcType=SMALLINT},
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkUserMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
similarity index 90%
rename from xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkUserMapper.xml
rename to xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
index 75819912..c9e04c36 100644
--- a/xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcWorkUserMapper.xml
+++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcWorkUserMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.workorder.mapper.XhpcWorkUserMapper">
-  <resultMap id="BaseResultMap" type="com.xhpc.workorder.domain.XhpcWorkUserDomain">
+<mapper namespace="com.xhpc.activity.mapper.XhpcWorkUserMapper">
+  <resultMap id="BaseResultMap" type="com.xhpc.activity.domain.XhpcWorkUserDomain">
     <id column="work_user_id" jdbcType="BIGINT" property="workUserId" />
     <result column="user_name" jdbcType="VARCHAR" property="userName" />
     <result column="dept_id" jdbcType="BIGINT" property="deptId" />
@@ -22,7 +22,7 @@
     `status`, del_flag, create_time, create_by, update_time, update_by
   </sql>
 
-  <select id="selectByUserNameAndPhone" resultType="com.xhpc.workorder.domain.XhpcWorkUserDomain">
+  <select id="selectByUserNameAndPhone" resultType="com.xhpc.activity.domain.XhpcWorkUserDomain">
     select
     <include refid="Base_Column_List" />
     from xhpc_work_user
@@ -40,7 +40,7 @@
   </select>
 
 
-  <select id="selectByOrderId" resultType="com.xhpc.workorder.domain.XhpcWorkUserDomain">
+  <select id="selectByOrderId" resultType="com.xhpc.activity.domain.XhpcWorkUserDomain">
     select
     <include refid="Base_Column_List" />
     FROM xhpc_work_user u
@@ -58,7 +58,7 @@
     update xhpc_work_user set del_flag=2
     where work_user_id = #{workUserId,jdbcType=BIGINT}
   </update>
-  <insert id="insert" keyColumn="work_user_id" keyProperty="workUserId" parameterType="com.xhpc.workorder.domain.XhpcWorkUserDomain" useGeneratedKeys="true">
+  <insert id="insert" keyColumn="work_user_id" keyProperty="workUserId" parameterType="com.xhpc.activity.domain.XhpcWorkUserDomain" useGeneratedKeys="true">
     insert into xhpc_work_user (user_name, dept_id, post_name, 
       phone, email, wechat_openid, 
       is_leader, `status`, del_flag, 
@@ -70,7 +70,7 @@
       sysdate(), #{createBy,jdbcType=VARCHAR}, sysdate(),
       #{updateBy,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" keyColumn="work_user_id" keyProperty="workUserId" parameterType="com.xhpc.workorder.domain.XhpcWorkUserDomain" useGeneratedKeys="true">
+  <insert id="insertSelective" keyColumn="work_user_id" keyProperty="workUserId" parameterType="com.xhpc.activity.domain.XhpcWorkUserDomain" useGeneratedKeys="true">
     insert into xhpc_work_user
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="userName != null">
@@ -143,7 +143,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.workorder.domain.XhpcWorkUserDomain">
+  <update id="updateByPrimaryKeySelective" parameterType="com.xhpc.activity.domain.XhpcWorkUserDomain">
     update xhpc_work_user
     <set>
       <if test="userName != null">
@@ -177,7 +177,7 @@
     </set>
     where work_user_id = #{workUserId,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.xhpc.workorder.domain.XhpcWorkUserDomain">
+  <update id="updateByPrimaryKey" parameterType="com.xhpc.activity.domain.XhpcWorkUserDomain">
     update xhpc_work_user
     set user_name = #{userName,jdbcType=VARCHAR},
       dept_id = #{deptId,jdbcType=BIGINT},
diff --git a/xhpc-modules/xhpc-clearing/.gitignore b/xhpc-modules/xhpc-clearing/.gitignore
deleted file mode 100644
index 54283dd4..00000000
--- a/xhpc-modules/xhpc-clearing/.gitignore
+++ /dev/null
@@ -1,35 +0,0 @@
-HELP.md
-target/
-.mvn/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea/
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/xhpc-modules/xhpc-clearing/pom.xml b/xhpc-modules/xhpc-clearing/pom.xml
deleted file mode 100644
index 4e532491..00000000
--- a/xhpc-modules/xhpc-clearing/pom.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>xhpc-modules</artifactId>
-        <version>3.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>xhpc-clearing</artifactId>
-
-    <description>
-        清分服务
-    </description>
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-    <dependencies>
-
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>3.5.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common DataSource -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-datasource</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common Core -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>xhpc-common</artifactId>
-            <version>3.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.10.12</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.10.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-log</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.4.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/XhpcClearingApplication.java b/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/XhpcClearingApplication.java
deleted file mode 100644
index 63d2d8cf..00000000
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/XhpcClearingApplication.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.xhpc;
-
-import com.xhpc.common.security.annotation.EnableCustomConfig;
-import com.xhpc.common.security.annotation.EnableRyFeignClients;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-
-@EnableConfigurationProperties
-@ConfigurationPropertiesScan(basePackages = {"com.xhpc.clearing.config"})
-@EnableScheduling
-@EnableCustomConfig
-@EnableRyFeignClients
-@EnableFeignClients
-@SpringBootApplication
-@MapperScan("com.xhpc.clearing.mapper")
-public class XhpcClearingApplication {
-
-    public static void main(String[] args) {
-
-        SpringApplication.run(XhpcClearingApplication.class, args);
-    }
-}
diff --git a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcHistoryOrderMapper.java
deleted file mode 100644
index 35c9470b..00000000
--- a/xhpc-modules/xhpc-clearing/src/main/java/com/xhpc/clearing/mapper/XhpcHistoryOrderMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.xhpc.clearing.mapper;
-
-import com.xhpc.clearing.domain.XhpcHistoryOrderDomain;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 历史订单信息 数据层
- *
- * @author ruoyi
- */
-public interface XhpcHistoryOrderMapper {
-
-    List<XhpcHistoryOrderDomain> selectUnsyncOrderList();
-
-
-    int updateStatusBatchByOrderIds(@Param("orderIds") List<Long> orderIds, @Param("status") Integer status);
-
-
-    BigDecimal selectUnclearingAmount(@Param("operatorId")String operatorId);
-
-}
diff --git a/xhpc-modules/xhpc-clearing/src/main/resources/banner.txt b/xhpc-modules/xhpc-clearing/src/main/resources/banner.txt
deleted file mode 100644
index 6801d887..00000000
--- a/xhpc-modules/xhpc-clearing/src/main/resources/banner.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
-
-       _                    _                 _
- __  _| |__  _ __   ___ ___| | ___  __ _ _ __(_)_ __   __ _
- \ \/ / '_ \| '_ \ / __/ __| |/ _ \/ _` | '__| | '_ \ / _` |
-  >  <| | | | |_) | (_| (__| |  __/ (_| | |  | | | | | (_| |
- /_/\_\_| |_| .__/ \___\___|_|\___|\__,_|_|  |_|_| |_|\__, |
-            |_|                                       |___/
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-clearing/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-clearing/src/main/resources/bootstrap.yml
deleted file mode 100644
index 7843faad..00000000
--- a/xhpc-modules/xhpc-clearing/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# Tomcat
-server:
-  port: 8913
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: xhpc-clearing
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-logging:
-  level:
-    root: info
-    com.xhpc.clearing.mapper: debug
-
-  pattern:
-    console: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n'
-    file: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n'
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-clearing/src/main/resources/logback.xml b/xhpc-modules/xhpc-clearing/src/main/resources/logback.xml
deleted file mode 100644
index c162b4d0..00000000
--- a/xhpc-modules/xhpc-clearing/src/main/resources/logback.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/xhpc-clearing"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern"
-              value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.xhpc" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/xhpc-modules/xhpc-log/.gitignore b/xhpc-modules/xhpc-log/.gitignore
deleted file mode 100644
index 54283dd4..00000000
--- a/xhpc-modules/xhpc-log/.gitignore
+++ /dev/null
@@ -1,35 +0,0 @@
-HELP.md
-target/
-.mvn/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea/
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/xhpc-modules/xhpc-log/pom.xml b/xhpc-modules/xhpc-log/pom.xml
deleted file mode 100644
index 01edd8a5..00000000
--- a/xhpc-modules/xhpc-log/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>xhpc-modules</artifactId>
-        <version>3.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>xhpc-log</artifactId>
-
-    <description>
-        日志服务
-    </description>
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-    <dependencies>
-
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>3.5.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common DataSource -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-datasource</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common Core -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>xhpc-common</artifactId>
-            <version>3.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.10.12</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.10.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.4.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/XhpcLogApplication.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/XhpcLogApplication.java
deleted file mode 100644
index 1207b609..00000000
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/XhpcLogApplication.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.xhpc;
-
-import com.xhpc.common.security.annotation.EnableCustomConfig;
-import com.xhpc.common.security.annotation.EnableRyFeignClients;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-
-@EnableScheduling
-@EnableCustomConfig
-@SpringBootApplication
-@EnableRyFeignClients
-@EnableDiscoveryClient
-@MapperScan("com.xhpc.log.mapper")
-public class XhpcLogApplication {
-
-    public static void main(String[] args) {
-
-        SpringApplication.run(XhpcLogApplication.class, args);
-    }
-}
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcHistoryOrderDomain.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcHistoryOrderDomain.java
deleted file mode 100644
index 9840e54d..00000000
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcHistoryOrderDomain.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package com.xhpc.log.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * xhpc_history_order
- * @author 
- */
-@Data
-public class XhpcHistoryOrderDomain implements Serializable {
-    /**
-     * 历史订单id
-     */
-    private Long historyOrderId;
-
-    /**
-     * 电站id
-     */
-    private Long chargingStationId;
-
-    /**
-     * 场站名称
-     */
-    private String chargingStationName;
-
-    /**
-     * 充电订单id
-     */
-    private Long chargeOrderId;
-
-    /**
-     * 用户id
-     */
-    private Long userId;
-
-    /**
-     * 终端id
-     */
-    private Long terminalId;
-
-    /**
-     * 订单编号
-     */
-    private String serialNumber;
-
-    /**
-     * 流量方订单号
-     */
-    private String internetSerialNumber;
-
-    /**
-     * 总电费
-     */
-    private BigDecimal powerPriceTotal;
-
-    /**
-     * 总服务费
-     */
-    private BigDecimal servicePriceTotal;
-
-    /**
-     * 订单总价
-     */
-    private BigDecimal totalPrice;
-
-    /**
-     * 电站活动抵扣--抵扣的总金额
-     */
-    private BigDecimal promotionDiscount;
-
-    /**
-     * 实际价格-用户支付的钱
-     */
-    private BigDecimal actPrice;
-
-    /**
-     * 实收电费-运营商电费
-     */
-    private BigDecimal actPowerPrice;
-
-    /**
-     * 实收服务费-运营商服务费
-     */
-    private BigDecimal actServicePrice;
-
-    /**
-     * 流量方总金额抽成
-     */
-    private BigDecimal internetCommission;
-
-    /**
-     * 流量方服务费抽成
-     */
-    private BigDecimal internetSvcCommission;
-
-    /**
-     * 平台总金额抽成
-     */
-    private BigDecimal platformCommission;
-
-    /**
-     * 平台服务费抽成
-     */
-    private BigDecimal platformSvcCommisssion;
-
-    /**
-     * 运维总抽成
-     */
-    private BigDecimal operationCommission;
-
-    /**
-     * 运维服务费抽成
-     */
-    private BigDecimal operationSvcCommission;
-
-    /**
-     * 开始充电soc
-     */
-    private String startSoc;
-
-    /**
-     * 结束时soc
-     */
-    private String endSoc;
-
-    /**
-     * 对账状态（0待确认 1已确认，2待提交，3待审核）
-     */
-    private Integer reconciliationStatus;
-
-    /**
-     * 清分状态（0待清分 1清分在途，2已提现，3待提交，4待审核）
-     */
-    private Integer sortingStatus;
-
-    /**
-     * 1 自动结算 2 平台结算
-     */
-    private Byte type;
-
-    /**
-     * 状态（0正常 1停用）
-     */
-    private Integer status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private Integer delFlag;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 0未统计 1小时统计 2 其他统计
-     */
-    private Integer state;
-
-    /**
-     * VIN 码
-     */
-    private String vinNormal;
-
-    private String searchValue;
-
-    /**
-     * 运营商在EVCS分配的唯一OperatorID
-     */
-    private String operatorIdEvcs;
-
-    private Integer chargeModelEvcs;
-
-    private Double connectorPowerEvcs;
-
-    private Double meterValueEndEvcs;
-
-    private Double meterValueStartEvcs;
-
-    private String operatorId3rdptyEvcs;
-
-    private Date startTime;
-
-    /**
-     * 结束时间
-     */
-    private Date endTime;
-
-    private Integer stopReasonEvcs;
-
-    private Double totalPower;
-
-    private String userNameEvcs;
-
-    private String phone;
-
-    /**
-     * 互联网订单流水号
-     */
-    private String evcsOrderNo;
-
-    /**
-     * -1:未推送/推送失败 0:成功 1:争议交易 2～99:自定义
-     */
-    private Integer confirmResult;
-
-    private Long rateModelId;
-
-    /**
-     * 充电方式
-     */
-    private String chargingMode;
-
-    /**
-     * 充电度数
-     */
-    private Double chargingDegree;
-
-    /**
-     * 充电时长
-     */
-    private String chargingTime;
-
-    private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java
deleted file mode 100644
index fbe1baa4..00000000
--- a/xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcHistoryOrderMapper.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.xhpc.log.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface XhpcHistoryOrderMapper {
-
-
-    List<Map<String, Object>> getOrderPage(@Param("params")Map params);
-
-}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-log/src/main/resources/banner.txt b/xhpc-modules/xhpc-log/src/main/resources/banner.txt
deleted file mode 100644
index be49df70..00000000
--- a/xhpc-modules/xhpc-log/src/main/resources/banner.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
-
-           ,--.
-,--.  ,--. |  ,---.   ,---.   ,---.
- \  `'  /  |  .-.  | | .-. | | .--'
- /  /.  \  |  | |  | | '-' ' \ `--.
-'--'  '--' `--' `--' |  |-'   `---'
-                     `--'
diff --git a/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml
deleted file mode 100644
index 24f214fb..00000000
--- a/xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-# Tomcat
-server:
-  port: 8890
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: xhpc-log
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 172.31.183.135:8848
-      config:
-        # 配置中心地址
-        server-addr: 172.31.183.135:8848
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-logging:
-  level:
-    root: info
-    com.xhpc.log.mapper: debug
-
-
-  file:
-    path: "d:\\logs"
-
-  pattern:
-    console: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n'
-    file: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n'
-
-wx:
-  pay:
-    appId: "wxd0a48e00319ef8a7"
-    mchId: "1514355771"
-    mchKey: "sichuanxianghuakejiyouxiangongsi"
-    keyPath:
-
-
-alibaba:
-  pay:
-    gatewayDomain: "https://openapi.alipay.com/gateway.do"
-    serverDomain: "https://www.scxhua.cn/prod-api/xhpc-payment/alipay/notifyUrl"
-    publicKey:
-    privateKey: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCGHX1s315EKjoIBkNiF3IxCAmvtVg+TdCDL/XmJZWdcZ23tEWmmIMsLRCLUKsaPfTEhnqD6EFJnmpJu4teDImo3aDbOoO31YFEXjMXUnTTS/dtDVEo1OecsRL+Re43KSohOkIL1TMyTuNfeIglQTuhCSZ3LOEOx4OHpYwcrLp8p1ORvAS7x35nsmjLp3oQTJo9RWfzfEaKbm6cxsWLKyr5/5eGDXrUHNC5hIDLjoJbe6iqNKyIiPJHtPZfJ36PcWa7PFvx4X+Ded32KZb2AA3p9w/HX7gn1MnRfT5NGH0k3ggxLNarDU8g6JjQYgNtmE/R8gbp99BudZNfDoSF1llNAgMBAAECggEAaTa9bSoXM/bErALt3ghyx1B8+OGVpts5F5IKoVEe/PNjPfkpIzdGwONhtUnF0cKFQaAWgWE1xuGGlO2Sumevn1Cvnw1axF+1F8Om5UcE67cPFvh5kUTlpyGrutt1tMSQjpy7r7jEf1UwP3e5pzBz7TPWf2wv635OC56uOtivPJZ+8vg7VYon/mNXQuL4AavoxfSDtvo0ad30X2fK1WKeeBtgiT4UzV6ZGZh5igKQHM4lVvmbo/jOeQD0KAod7pRe/h4FBFmCVIWwgW+I+Hnzp8A/nJezoowJ3jiTt0FodC9uBCT64ZCz5dVCryD62LDVjKBxB7cfIoQA+PxCiXr9QQKBgQD+2v38J/MlfK/XCYldclzumizwIw6T0Mv6XvYwXQHYgYDKYNF6k1LhMEUo7fP3EsPdV8h/nXmdU4qadOVm6QSJ/rGEl22yGlO7woUzTY/Ls9eknoqfMYuyI1+ICMnNxmesQbWyc0cOHh44cEF+icfJxEDAmrHGLmBVsKuLUJUuVQKBgQCGt663TF7mixghiUOcT11zC1fqG+dIcvAwHpCHfdxsniYRqnv+SLf6eC5PCkQ5aNAAl/ywOLQAWS0XgYti3LyZ4iuGIYcUE0IDDmhWl68V27iXcLIK+rBRqBGxSdk8xR+zSE8fpO4mXpxn8SH0Butex8PJ+oHTbmdXIUAXdn6HGQKBgQCvAB1rqtsRoL72ADxtCHy78u5srwXxhmyqrc6LgzIjQzn2vejaLJO6wfSbmFnwDNimAwNQbgf2ekkwqphjxBozz8qB66GNrPpWccoZYmcdT48CIUO68MCmQBf3R2GbhWPnKu/ja7kc/p1tz9eJVn70E2kLWK4+EdZgwQHqlhj6SQKBgF4AmbdpYOb5s9Li1vyhHJIEHkpLQi15lkPdb/g7SK26BNJa5b5fu5DYf2fDwCtXCZ0AcN/+EQwVLbOzPzGy2R9/g+NKTdkiPvOnAAM8QH2+HaX+ix3CI3o3DnFpGF6hJieRkzR/f3Ximryks451rZMrTWEIncKMzSstFm3Izy0xAoGBAJQaMqlzpM+QaJiytJNeqRpPWRsi0Dkf4XqJXPWLOrApSISsafZF5vk2ZOeIqRsVCBH3LdfVIJxEBAF4l/Sd2q7xC9JHawJDqa4ea7VwL68ANH2w3jcJ3j6DQqf7NIe/lSGxYF6Jt+74oRFHxN3GDSf+z91DYfZz8hQnyphKDNEJ"
-    appId: "2021002156615717"
-    certPath: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt"
-    publicCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt"
-    rootCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt"
diff --git a/xhpc-modules/xhpc-log/src/main/resources/logback.xml b/xhpc-modules/xhpc-log/src/main/resources/logback.xml
deleted file mode 100644
index b9558135..00000000
--- a/xhpc-modules/xhpc-log/src/main/resources/logback.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/xhpc-log"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern"
-              value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.xhpc" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
deleted file mode 100644
index 42e944a0..00000000
--- a/xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.log.mapper.XhpcHistoryOrderMapper">
-
-    <select id="getOrderPage" resultType="map">
-        select
-            co.serial_number as 'serialNumber',
-            co.source as 'source',
-            case co.source when 0 then 'C端用户'
-            when 1 then '流量方用户'
-            when 2 then '社区用户'
-            when 3 then 'B端用户' end  as 'sourceName',
-            replace(co.start_time, 'T', ' ')  as 'startTime',
-            replace(co.end_time, 'T', ' ') as 'endTime'
-        from xhpc_charge_order as co
-        left join xhpc_charging_station as st on st.charging_station_id =co.charging_station_id
-        where co.del_flag =0
-        <if test="params.orderId!=null and params.orderId!=''">
-            and co.serial_number like concat('%', #{params.orderId},'%')
-        </if>
-        <if test="params.number !=0 and params.number ==1">
-            and co.charging_station_id in(select charging_station_id from xhpc_charging_station where operator_id=#{params.operatorId})
-        </if>
-        <if test="params.number !=0 and params.number ==2">
-            and co.charging_station_id in(select charging_station_id from xhpc_user_privilege where user_id=#{params.operatorId})
-        </if>
-        <if test="params.tenantId != null and params.tenantId != ''">
-            and co.tenant_id = #{params.tenantId}
-        </if>
-        <if test="params.startTime!=null and params.startTime!=''">
-            and co.start_time <![CDATA[ >=  ]]> #{params.startTime}
-        </if>
-        <if test="params.endTime !=null and params.endTime!=''">
-            and co.create_time <![CDATA[ <=  ]]> #{params.endTime}
-        </if>
-
-        order by co.create_time desc
-    </select>
-
-
-
-</mapper>
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-tradebill/.gitignore b/xhpc-modules/xhpc-tradebill/.gitignore
deleted file mode 100644
index 54283dd4..00000000
--- a/xhpc-modules/xhpc-tradebill/.gitignore
+++ /dev/null
@@ -1,35 +0,0 @@
-HELP.md
-target/
-.mvn/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea/
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/xhpc-modules/xhpc-tradebill/pom.xml b/xhpc-modules/xhpc-tradebill/pom.xml
deleted file mode 100644
index dd1675f2..00000000
--- a/xhpc-modules/xhpc-tradebill/pom.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>xhpc-modules</artifactId>
-        <version>3.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>xhpc-tradebill</artifactId>
-
-    <description>
-        账单对账服务
-    </description>
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-    <dependencies>
-
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>3.5.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common DataSource -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-datasource</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common Core -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>xhpc-common</artifactId>
-            <version>3.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.10.12</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.10.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-log</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.4.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/XhpcTradebillApplication.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/XhpcTradebillApplication.java
deleted file mode 100644
index 09ea9825..00000000
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/XhpcTradebillApplication.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.xhpc;
-
-import com.xhpc.common.security.annotation.EnableCustomConfig;
-import com.xhpc.common.security.annotation.EnableRyFeignClients;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-
-
-@EnableConfigurationProperties
-@ConfigurationPropertiesScan(basePackages = {"com.xhpc.tradebill.config"})
-@EnableCustomConfig
-@SpringBootApplication
-@EnableRyFeignClients
-@EnableDiscoveryClient
-@MapperScan("com.xhpc.tradebill.mapper")
-public class XhpcTradebillApplication {
-
-    public static void main(String[] args) {
-
-        SpringApplication.run(XhpcTradebillApplication.class, args);
-    }
-}
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/config/AliOSSProperties.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/config/AliOSSProperties.java
deleted file mode 100644
index 8a27c310..00000000
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/config/AliOSSProperties.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.xhpc.tradebill.config;
-
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-
-/**
- * 支付宝支付配置类
- */
-@Data
-@ConfigurationProperties(prefix = "oss")
-public class AliOSSProperties {
-
-    private boolean enabled;
-    private String name;
-    private boolean tenantMode;
-    private String endpoint;
-    private String accessKey;
-    private String secretKey;
-    private String bucketName;
-    private String region;
-    private String domain;
-}
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcChargeOrderDomain.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcChargeOrderDomain.java
deleted file mode 100644
index 84e6315f..00000000
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcChargeOrderDomain.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.xhpc.tradebill.domain;
-
-import lombok.Data;
-
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-
-@Data
-@Table(name="xhpc_charge_order")
-public class XhpcChargeOrderDomain implements Serializable {
-    /**
-     * 充电订单id
-     */
-    private Long chargeOrderId;
-
-    /**
-     * 电站id
-     */
-    private Long chargingStationId;
-
-    /**
-     * 用户id
-     */
-    private Long userId;
-
-    /**
-     * 终端id
-     */
-    private Long terminalId;
-
-    /**
-     * 互联网流水订单号
-     */
-    private String internetSerialNumber;
-
-    /**
-     * 订单编号
-     */
-    private String serialNumber;
-
-    /**
-     * 充电启始soc
-     */
-    private String startSoc;
-
-    /**
-     * 结束soc
-     */
-    private String endSoc;
-
-    /**
-     * 订单来源（0C端用户 1流量用户）
-     */
-    private Integer source;
-
-    /**
-     * 状态（-1准备充电 0开始充电 1自动结算，2异常，3平台结算）
-     */
-    private Integer status;
-
-    /**
-     * 删除标志（0代表存在 1代表删除）
-     */
-    private Integer delFlag;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 费率模型id
-     */
-    private Long rateModelId;
-
-    /**
-     * 充电方式
-     */
-    private String chargingMode;
-
-    /**
-     * 开始充电时间
-     */
-    private Date startTime;
-
-    /**
-     * 结束充电时间
-     */
-    private Date endTime;
-
-    /**
-     * 充电时长
-     */
-    private String chargingTime;
-
-    /**
-     * 充电度数
-     */
-    private BigDecimal chargingDegree;
-
-    /**
-     * 协议定,停止方式
-     */
-    private Integer type;
-
-    /**
-     * 异常备注
-     */
-    private String erroRemark;
-
-    /**
-     * 总金额
-     */
-    private BigDecimal amountCharged;
-
-    /**
-     * 功率
-     */
-    private String power;
-
-    /**
-     * 充电时长（秒）
-     */
-    private Long chargingTimeNumber;
-
-    /**
-     * 司机唯一标识（手机号）
-     */
-    private String driverId;
-
-    /**
-     * 充电金额
-     */
-    private Integer chargingAmt;
-
-    /**
-     * 车牌
-     */
-    private String plateNum;
-
-    /**
-     * 符合Evcs标准的订单号,并非来自第三方的订单号
-     */
-    private String evcsOrderNo;
-
-    private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcHistoryOrderDomain.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcHistoryOrderDomain.java
deleted file mode 100644
index 94af4242..00000000
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/domain/XhpcHistoryOrderDomain.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package com.xhpc.tradebill.domain;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * xhpc_history_order
- * @author 
- */
-@Data
-public class XhpcHistoryOrderDomain implements Serializable {
-    /**
-     * 历史订单id
-     */
-    private Long historyOrderId;
-
-    /**
-     * 电站id
-     */
-    private Long chargingStationId;
-
-    /**
-     * 场站名称
-     */
-    private String chargingStationName;
-
-    /**
-     * 充电订单id
-     */
-    private Long chargeOrderId;
-
-    /**
-     * 用户id
-     */
-    private Long userId;
-
-    /**
-     * 终端id
-     */
-    private Long terminalId;
-
-    /**
-     * 订单编号
-     */
-    private String serialNumber;
-
-    /**
-     * 流量方订单号
-     */
-    private String internetSerialNumber;
-
-    /**
-     * 总电费
-     */
-    private BigDecimal powerPriceTotal;
-
-    /**
-     * 总服务费
-     */
-    private BigDecimal servicePriceTotal;
-
-    /**
-     * 订单总价
-     */
-    private BigDecimal totalPrice;
-
-    /**
-     * 电站活动抵扣--抵扣的总金额
-     */
-    private BigDecimal promotionDiscount;
-
-    /**
-     * 实际价格-用户支付的钱
-     */
-    private BigDecimal actPrice;
-
-    /**
-     * 实收电费-运营商电费
-     */
-    private BigDecimal actPowerPrice;
-
-    /**
-     * 实收服务费-运营商服务费
-     */
-    private BigDecimal actServicePrice;
-
-    /**
-     * 流量方总金额抽成
-     */
-    private BigDecimal internetCommission;
-
-    /**
-     * 流量方服务费抽成
-     */
-    private BigDecimal internetSvcCommission;
-
-    /**
-     * 平台总金额抽成
-     */
-    private BigDecimal platformCommission;
-
-    /**
-     * 平台服务费抽成
-     */
-    private BigDecimal platformSvcCommisssion;
-
-    /**
-     * 运维总抽成
-     */
-    private BigDecimal operationCommission;
-
-    /**
-     * 运维服务费抽成
-     */
-    private BigDecimal operationSvcCommission;
-
-    /**
-     * 开始充电soc
-     */
-    private String startSoc;
-
-    /**
-     * 结束时soc
-     */
-    private String endSoc;
-
-    /**
-     * 对账状态（0待确认 1已确认，2待提交，3待审核）
-     */
-    private Integer reconciliationStatus;
-
-    /**
-     * 清分状态（0待清分 1清分在途，2已提现，3待提交，4待审核）
-     */
-    private Integer sortingStatus;
-
-    /**
-     * 1 自动结算 2 平台结算
-     */
-    private Byte type;
-
-    /**
-     * 状态（0正常 1停用）
-     */
-    private Integer status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private Integer delFlag;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 0未统计 1小时统计 2 其他统计
-     */
-    private Integer state;
-
-    /**
-     * VIN 码
-     */
-    private String vinNormal;
-
-    private String searchValue;
-
-    /**
-     * 运营商在EVCS分配的唯一OperatorID
-     */
-    private String operatorIdEvcs;
-
-    private Integer chargeModelEvcs;
-
-    private Double connectorPowerEvcs;
-
-    private Double meterValueEndEvcs;
-
-    private Double meterValueStartEvcs;
-
-    private String operatorId3rdptyEvcs;
-
-    private Date startTime;
-
-    /**
-     * 结束时间
-     */
-    private Date endTime;
-
-    private Integer stopReasonEvcs;
-
-    private Double totalPower;
-
-    private String userNameEvcs;
-
-    private String phone;
-
-    /**
-     * 互联网订单流水号
-     */
-    private String evcsOrderNo;
-
-    /**
-     * -1:未推送/推送失败 0:成功 1:争议交易 2～99:自定义
-     */
-    private Integer confirmResult;
-
-    private Long rateModelId;
-
-    /**
-     * 充电方式
-     */
-    private String chargingMode;
-
-    /**
-     * 充电度数
-     */
-    private Double chargingDegree;
-
-    /**
-     * 充电时长
-     */
-    private String chargingTime;
-
-    private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/utils/DownloadUtil.java b/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/utils/DownloadUtil.java
deleted file mode 100644
index ab9bdf9c..00000000
--- a/xhpc-modules/xhpc-tradebill/src/main/java/com/xhpc/tradebill/utils/DownloadUtil.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.xhpc.tradebill.utils;
-
-import cn.hutool.http.HttpUtil;
-import com.xhpc.common.core.utils.StringUtils;
-
-import java.io.File;
-
-public class DownloadUtil {
-
-    public static File downloadFile(String fileUrl) throws Exception {
-
-        if (StringUtils.isEmpty(fileUrl)) {
-            throw new Exception("文件地址为空");
-        }
-        String suffix = fileUrl.substring(fileUrl.lastIndexOf("."));
-        return HttpUtil.downloadFileFromUrl(fileUrl, File.createTempFile("temp_", suffix));
-    }
-}
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/banner.txt b/xhpc-modules/xhpc-tradebill/src/main/resources/banner.txt
deleted file mode 100644
index be49df70..00000000
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/banner.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
-
-           ,--.
-,--.  ,--. |  ,---.   ,---.   ,---.
- \  `'  /  |  .-.  | | .-. | | .--'
- /  /.  \  |  | |  | | '-' ' \ `--.
-'--'  '--' `--' `--' |  |-'   `---'
-                     `--'
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-tradebill/src/main/resources/bootstrap.yml
deleted file mode 100644
index 8b7bb1ee..00000000
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-
-# Tomcat
-server:
-  port: 8889
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: xhpc-tradebill
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 172.31.183.135:8848
-      config:
-        # 配置中心地址
-        server-addr: 172.31.183.135:8848
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-logging:
-  level:
-    root: info
-    com.xhpc.tradebill.mapper: debug
-
-  file:
-    path: "d:\\logs"
-
-  pattern:
-    console: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n'
-    file: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n'
-
-wx:
-  pay:
-    appId: "wxd0a48e00319ef8a7"
-    mchId: "1514355771"
-    mchKey: "sichuanxianghuakejiyouxiangongsi"
-    keyPath:
-
-
-alibaba:
-  pay:
-    gatewayDomain: "https://openapi.alipay.com/gateway.do"
-    serverDomain: "https://www.scxhua.cn/prod-api/xhpc-payment/alipay/notifyUrl"
-    publicKey:
-    privateKey: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCGHX1s315EKjoIBkNiF3IxCAmvtVg+TdCDL/XmJZWdcZ23tEWmmIMsLRCLUKsaPfTEhnqD6EFJnmpJu4teDImo3aDbOoO31YFEXjMXUnTTS/dtDVEo1OecsRL+Re43KSohOkIL1TMyTuNfeIglQTuhCSZ3LOEOx4OHpYwcrLp8p1ORvAS7x35nsmjLp3oQTJo9RWfzfEaKbm6cxsWLKyr5/5eGDXrUHNC5hIDLjoJbe6iqNKyIiPJHtPZfJ36PcWa7PFvx4X+Ded32KZb2AA3p9w/HX7gn1MnRfT5NGH0k3ggxLNarDU8g6JjQYgNtmE/R8gbp99BudZNfDoSF1llNAgMBAAECggEAaTa9bSoXM/bErALt3ghyx1B8+OGVpts5F5IKoVEe/PNjPfkpIzdGwONhtUnF0cKFQaAWgWE1xuGGlO2Sumevn1Cvnw1axF+1F8Om5UcE67cPFvh5kUTlpyGrutt1tMSQjpy7r7jEf1UwP3e5pzBz7TPWf2wv635OC56uOtivPJZ+8vg7VYon/mNXQuL4AavoxfSDtvo0ad30X2fK1WKeeBtgiT4UzV6ZGZh5igKQHM4lVvmbo/jOeQD0KAod7pRe/h4FBFmCVIWwgW+I+Hnzp8A/nJezoowJ3jiTt0FodC9uBCT64ZCz5dVCryD62LDVjKBxB7cfIoQA+PxCiXr9QQKBgQD+2v38J/MlfK/XCYldclzumizwIw6T0Mv6XvYwXQHYgYDKYNF6k1LhMEUo7fP3EsPdV8h/nXmdU4qadOVm6QSJ/rGEl22yGlO7woUzTY/Ls9eknoqfMYuyI1+ICMnNxmesQbWyc0cOHh44cEF+icfJxEDAmrHGLmBVsKuLUJUuVQKBgQCGt663TF7mixghiUOcT11zC1fqG+dIcvAwHpCHfdxsniYRqnv+SLf6eC5PCkQ5aNAAl/ywOLQAWS0XgYti3LyZ4iuGIYcUE0IDDmhWl68V27iXcLIK+rBRqBGxSdk8xR+zSE8fpO4mXpxn8SH0Butex8PJ+oHTbmdXIUAXdn6HGQKBgQCvAB1rqtsRoL72ADxtCHy78u5srwXxhmyqrc6LgzIjQzn2vejaLJO6wfSbmFnwDNimAwNQbgf2ekkwqphjxBozz8qB66GNrPpWccoZYmcdT48CIUO68MCmQBf3R2GbhWPnKu/ja7kc/p1tz9eJVn70E2kLWK4+EdZgwQHqlhj6SQKBgF4AmbdpYOb5s9Li1vyhHJIEHkpLQi15lkPdb/g7SK26BNJa5b5fu5DYf2fDwCtXCZ0AcN/+EQwVLbOzPzGy2R9/g+NKTdkiPvOnAAM8QH2+HaX+ix3CI3o3DnFpGF6hJieRkzR/f3Ximryks451rZMrTWEIncKMzSstFm3Izy0xAoGBAJQaMqlzpM+QaJiytJNeqRpPWRsi0Dkf4XqJXPWLOrApSISsafZF5vk2ZOeIqRsVCBH3LdfVIJxEBAF4l/Sd2q7xC9JHawJDqa4ea7VwL68ANH2w3jcJ3j6DQqf7NIe/lSGxYF6Jt+74oRFHxN3GDSf+z91DYfZz8hQnyphKDNEJ"
-    appId: "2021002156615717"
-    certPath: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt"
-    publicCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt"
-    rootCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt"
-
-###获取微信openid地址
-#WXGETJSCODE: "https://api.weixin.qq.com/sns/jscode2session?appid=wxb14ef93e9b7901f3&secret=b5c5672141b5930c30a1abee95a2dcbf&js_code="
-###阿里云身份证验证地址
-#VERIFYCARD: "http://idenauthen.market.alicloudapi.com/idenAuthentication"
-##阿里云身份证验证地址appcode
-#APPCODE: "APPCODE e26d9088b58e24af69411d5933cece47"
-##小程序appid
-#APPID: "wxd0a48e00319ef8a7"
-##小程序绑定商户id
-#MCHID: "1514355771"
-##商户后台设置的key
-#KEY: "sichuanxianghuakejiyouxiangongsi"
-##微信小程序支付地址
-#WXPAYUNIFIEDORDER: "https://api.mch.weixin.qq.com/pay/unifiedorder"
-##微信支付回调地址
-#SERVERDOMAIN: "http://www.scxhua.cn/prod-api/xhpc-payment/wx/paymentCallback"
-##微信小程序支付地址
-#WXTRANSFERS: "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers"
-
-##支付宝支付回调地址
-#ALIPAYPSERVERDOMAIN: "https://www.scxhua.cn/prod-api/xhpc-payment/alipay/notifyUrl"
-##支付宝公钥
-#ALIPAYPUBLICKEY:
-##应用私钥
-#ALIPAYPRIVATEKEY: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCGHX1s315EKjoIBkNiF3IxCAmvtVg+TdCDL/XmJZWdcZ23tEWmmIMsLRCLUKsaPfTEhnqD6EFJnmpJu4teDImo3aDbOoO31YFEXjMXUnTTS/dtDVEo1OecsRL+Re43KSohOkIL1TMyTuNfeIglQTuhCSZ3LOEOx4OHpYwcrLp8p1ORvAS7x35nsmjLp3oQTJo9RWfzfEaKbm6cxsWLKyr5/5eGDXrUHNC5hIDLjoJbe6iqNKyIiPJHtPZfJ36PcWa7PFvx4X+Ded32KZb2AA3p9w/HX7gn1MnRfT5NGH0k3ggxLNarDU8g6JjQYgNtmE/R8gbp99BudZNfDoSF1llNAgMBAAECggEAaTa9bSoXM/bErALt3ghyx1B8+OGVpts5F5IKoVEe/PNjPfkpIzdGwONhtUnF0cKFQaAWgWE1xuGGlO2Sumevn1Cvnw1axF+1F8Om5UcE67cPFvh5kUTlpyGrutt1tMSQjpy7r7jEf1UwP3e5pzBz7TPWf2wv635OC56uOtivPJZ+8vg7VYon/mNXQuL4AavoxfSDtvo0ad30X2fK1WKeeBtgiT4UzV6ZGZh5igKQHM4lVvmbo/jOeQD0KAod7pRe/h4FBFmCVIWwgW+I+Hnzp8A/nJezoowJ3jiTt0FodC9uBCT64ZCz5dVCryD62LDVjKBxB7cfIoQA+PxCiXr9QQKBgQD+2v38J/MlfK/XCYldclzumizwIw6T0Mv6XvYwXQHYgYDKYNF6k1LhMEUo7fP3EsPdV8h/nXmdU4qadOVm6QSJ/rGEl22yGlO7woUzTY/Ls9eknoqfMYuyI1+ICMnNxmesQbWyc0cOHh44cEF+icfJxEDAmrHGLmBVsKuLUJUuVQKBgQCGt663TF7mixghiUOcT11zC1fqG+dIcvAwHpCHfdxsniYRqnv+SLf6eC5PCkQ5aNAAl/ywOLQAWS0XgYti3LyZ4iuGIYcUE0IDDmhWl68V27iXcLIK+rBRqBGxSdk8xR+zSE8fpO4mXpxn8SH0Butex8PJ+oHTbmdXIUAXdn6HGQKBgQCvAB1rqtsRoL72ADxtCHy78u5srwXxhmyqrc6LgzIjQzn2vejaLJO6wfSbmFnwDNimAwNQbgf2ekkwqphjxBozz8qB66GNrPpWccoZYmcdT48CIUO68MCmQBf3R2GbhWPnKu/ja7kc/p1tz9eJVn70E2kLWK4+EdZgwQHqlhj6SQKBgF4AmbdpYOb5s9Li1vyhHJIEHkpLQi15lkPdb/g7SK26BNJa5b5fu5DYf2fDwCtXCZ0AcN/+EQwVLbOzPzGy2R9/g+NKTdkiPvOnAAM8QH2+HaX+ix3CI3o3DnFpGF6hJieRkzR/f3Ximryks451rZMrTWEIncKMzSstFm3Izy0xAoGBAJQaMqlzpM+QaJiytJNeqRpPWRsi0Dkf4XqJXPWLOrApSISsafZF5vk2ZOeIqRsVCBH3LdfVIJxEBAF4l/Sd2q7xC9JHawJDqa4ea7VwL68ANH2w3jcJ3j6DQqf7NIe/lSGxYF6Jt+74oRFHxN3GDSf+z91DYfZz8hQnyphKDNEJ"
-##支付宝appid
-#ALIPAYAPPID: "2021002156615717"
-##应用公钥证书路径
-#CERTPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt"
-##支付宝公钥证书路径
-#PUBLICCERTPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt"
-##支付宝根证书路径
-#ROOTCRETPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt"
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/logback.xml b/xhpc-modules/xhpc-tradebill/src/main/resources/logback.xml
deleted file mode 100644
index be0d0138..00000000
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/logback.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/xhpc-tradebill"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern"
-              value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.xhpc" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>
diff --git a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
deleted file mode 100644
index 943966e5..00000000
--- a/xhpc-modules/xhpc-tradebill/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhpc.tradebill.mapper.XhpcHistoryOrderMapper">
-
-    <select id="findOneBySerialNumber" resultType="com.xhpc.tradebill.domain.XhpcHistoryOrderDomain">
-        select
-               o.*,
-               s.name as 'charging_station_name'
-        from
-        xhpc_history_order o
-            left join xhpc_charging_station s on o.charging_station_id=s.charging_station_id
-        where serial_number=#{serialNumber}
-    </select>
-
-    <select id="findOneByInternetSerialNumber" resultType="com.xhpc.tradebill.domain.XhpcHistoryOrderDomain">
-        select
-            o.*,
-            s.name as 'charging_station_name',
-            c.charging_degree as 'charging_degree',
-            c.charging_time as 'charging_time'
-        from xhpc_history_order o
-        left join xhpc_charging_station s on o.charging_station_id=s.charging_station_id
-        left join xhpc_charge_order c on o.charge_order_id=c.charge_order_id
-        where o.internet_serial_number=#{internetSerialNumber}
-    </select>
-
-    <select id="findListByInternetSerialNumbers" resultType="com.xhpc.tradebill.domain.XhpcHistoryOrderDomain">
-        select
-            o.*,
-            s.name as 'charging_station_name',
-                c.charging_degree as 'charging_degree',
-                c.charging_time as 'charging_time'
-        from xhpc_history_order o
-                 left join xhpc_charging_station s on o.charging_station_id=s.charging_station_id
-                 left join xhpc_charge_order c on o.charge_order_id=c.charge_order_id
-        where o.internet_serial_number in
-        <foreach collection="orderNumbers" item="orderNumber" open="(" close=")" separator=",">
-            #{orderNumber}
-        </foreach>
-    </select>
-
-    <select id="findListByTimeBetween" resultType="com.xhpc.tradebill.domain.XhpcHistoryOrderDomain">
-        select
-        o.*,
-        s.name as 'charging_station_name',
-        c.charging_degree as 'charging_degree',
-        c.charging_time as 'charging_time'
-        from xhpc_history_order o
-        left join xhpc_charging_station s on o.charging_station_id=s.charging_station_id
-        left join xhpc_charge_order c on o.charge_order_id=c.charge_order_id
-        where o.tenant_id=#{tenantId}
-        <if test="startTime!=null and startTime != ''">
-            and o.create_time <![CDATA[ >= ]]> #{startTime}
-        </if>
-        <if test="endTime != null and endTime !=''">
-            and o.create_time <![CDATA[ <= ]]> #{endTime}
-        </if>
-    </select>
-
-</mapper>
\ No newline at end of file
diff --git a/xhpc-modules/xhpc-workorder/.gitignore b/xhpc-modules/xhpc-workorder/.gitignore
deleted file mode 100644
index 54283dd4..00000000
--- a/xhpc-modules/xhpc-workorder/.gitignore
+++ /dev/null
@@ -1,35 +0,0 @@
-HELP.md
-target/
-.mvn/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea/
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
diff --git a/xhpc-modules/xhpc-workorder/pom.xml b/xhpc-modules/xhpc-workorder/pom.xml
deleted file mode 100644
index c91fa33e..00000000
--- a/xhpc-modules/xhpc-workorder/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>xhpc-modules</artifactId>
-        <version>3.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>xhpc-workorder</artifactId>
-
-    <description>
-        工单服务
-    </description>
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-    <dependencies>
-
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>3.5.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common DataSource -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-datasource</artifactId>
-        </dependency>
-
-        <!-- RuoYi Common Core -->
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>xhpc-common</artifactId>
-            <version>3.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.10.12</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-log</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.4.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/XhpcWorkOrderApplication.java b/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/XhpcWorkOrderApplication.java
deleted file mode 100644
index 1d8a3edb..00000000
--- a/xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/XhpcWorkOrderApplication.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.xhpc;
-
-import com.xhpc.common.security.annotation.EnableCustomConfig;
-import com.xhpc.common.security.annotation.EnableRyFeignClients;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-
-
-@EnableCustomConfig
-@EnableRyFeignClients
-@EnableFeignClients
-@SpringBootApplication
-@MapperScan("com.xhpc.workorder.mapper")
-public class XhpcWorkOrderApplication {
-
-    public static void main(String[] args) {
-
-        SpringApplication.run(XhpcWorkOrderApplication.class, args);
-    }
-}
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/banner.txt b/xhpc-modules/xhpc-workorder/src/main/resources/banner.txt
deleted file mode 100644
index be49df70..00000000
--- a/xhpc-modules/xhpc-workorder/src/main/resources/banner.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
-
-           ,--.
-,--.  ,--. |  ,---.   ,---.   ,---.
- \  `'  /  |  .-.  | | .-. | | .--'
- /  /.  \  |  | |  | | '-' ' \ `--.
-'--'  '--' `--' `--' |  |-'   `---'
-                     `--'
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-workorder/src/main/resources/bootstrap.yml
deleted file mode 100644
index 7fc81a54..00000000
--- a/xhpc-modules/xhpc-workorder/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# Tomcat
-server:
-  port: 8909
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: xhpc-workorder
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 172.31.183.135:8848
-      config:
-        # 配置中心地址
-        server-addr: 172.31.183.135:8848
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-logging:
-  level:
-    root: info
-    com.xhpc.workorder.mapper: debug
-
-  pattern:
-    console: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n'
-    file: '%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n'
diff --git a/xhpc-modules/xhpc-workorder/src/main/resources/logback.xml b/xhpc-modules/xhpc-workorder/src/main/resources/logback.xml
deleted file mode 100644
index fbbfd992..00000000
--- a/xhpc-modules/xhpc-workorder/src/main/resources/logback.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/xhpc-workorder"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern"
-              value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.xhpc" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>