合并workorder、log、tradebill、clearing项目到activity

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>

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

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;

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.activity.domain.XhpcTradebillUploadRecordDomain;
-import com.xhpc.tradebill.service.CommonService;
+import com.xhpc.activity.service.CommonService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 

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.activity.domain.XhpcTradebillInternetCheckRecordDomain;
-import com.xhpc.tradebill.service.InternetBillService;
+import com.xhpc.activity.service.InternetBillService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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;

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.activity.domain.XhpcTradebillPaymentCheckRecordDomain;
-import com.xhpc.tradebill.service.PaymentBillService;
+import com.xhpc.activity.service.PaymentBillService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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.*;
 

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;

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;

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.activity.domain.XhpcWorkOrderDomain;
-import com.xhpc.workorder.service.WorkOrderService;
+import com.xhpc.activity.service.WorkOrderService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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.activity.domain.XhpcStationDeviceDomain;
-import com.xhpc.workorder.service.WorkStationService;
+import com.xhpc.activity.service.WorkStationService;
-import com.xhpc.workorder.service.WorkUserService;
+import com.xhpc.activity.service.WorkUserService;
-import com.xhpc.workorder.vo.XhpcStationDeviceVo;
+import com.xhpc.activity.vo.XhpcStationDeviceVo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 

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.activity.domain.XhpcWorkTypeDictDomain;
-import com.xhpc.workorder.service.WorkTypeService;
+import com.xhpc.activity.service.WorkTypeService;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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.activity.domain.XhpcClearingBankDomain;
-import com.xhpc.clearing.service.XhpcClearingBankService;
+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;

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.activity.domain.XhpcClearingCheckoutDomain;
-import com.xhpc.clearing.service.XhpcClearingCheckoutService;
+import com.xhpc.activity.service.XhpcClearingCheckoutService;
-import com.xhpc.clearing.vo.ClearingReceiptVo;
+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;

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.activity.service.XhpcClearingHistoryOrderService;
-import com.xhpc.clearing.domain.XhpcClearingCheckoutDomain;
+import com.xhpc.activity.vo.ClearingOrderVo;
-import com.xhpc.clearing.service.XhpcClearingCheckoutService;
-import com.xhpc.clearing.service.XhpcClearingHistoryOrderService;
-import com.xhpc.clearing.vo.ClearingOrderVo;
 import com.xhpc.common.core.domain.R;
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.StringUtils;

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;

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;
 

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;

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;

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;

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;

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;

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;
 }

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;
 

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;
 

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;
 

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;

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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;

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;
 

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;

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;
 

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

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;
 

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;
 

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;

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;
 

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;

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.activity.domain.XhpcClearingCheckoutDomain;
-import com.xhpc.clearing.vo.CheckoutBankVo;
+import com.xhpc.activity.vo.CheckoutBankVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;

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;

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;

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;

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 com.xhpc.activity.domain.XhpcHistoryOrderDomain;
-import org.apache.ibatis.annotations.Mapper;
 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);
 

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;

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;
 

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;
 

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;

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;
 

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;
 

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;
 

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;

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;

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.activity.domain.XhpcWorkOrderDomain;
-import com.xhpc.workorder.domain.XhpcWorkOrderUserDomain;
+import com.xhpc.activity.domain.XhpcWorkOrderUserDomain;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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);

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.activity.domain.XhpcStationDeviceDomain;
-import com.xhpc.workorder.domain.XhpcWorkStationDomain;
+import com.xhpc.activity.domain.XhpcWorkStationDomain;
-import com.xhpc.workorder.vo.XhpcStationDeviceVo;
+import com.xhpc.activity.vo.XhpcStationDeviceVo;
 
 import java.util.List;
 import java.util.Map;

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;

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;

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;

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.activity.domain.XhpcClearingCheckoutDomain;
-import com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain;
+import com.xhpc.activity.vo.ClearingReceiptVo;
-import com.xhpc.clearing.vo.ClearingReceiptVo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

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.activity.domain.XhpcClearingHistoryOrderDomain;
-import com.xhpc.clearing.vo.ClearingOrderVo;
+import com.xhpc.activity.vo.ClearingOrderVo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

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.activity.config.AliOSSProperties;
-import com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain;
-import com.xhpc.tradebill.domain.XhpcTradebillPaymentCheckRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillPaymentCheckRecordDomain;
-import com.xhpc.tradebill.domain.XhpcTradebillUploadRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillUploadRecordDomain;
-import com.xhpc.tradebill.mapper.XhpcTradebillUploadRecordMapper;
+import com.xhpc.activity.mapper.XhpcTradebillUploadRecordMapper;
-import com.xhpc.tradebill.service.CommonService;
+import com.xhpc.activity.service.CommonService;
-import com.xhpc.tradebill.service.InternetBillService;
+import com.xhpc.activity.service.InternetBillService;
-import com.xhpc.tradebill.service.PaymentBillService;
+import com.xhpc.activity.service.PaymentBillService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;

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.activity.domain.XhpcHistoryOrderDomain;
-import com.xhpc.tradebill.domain.XhpcTradebillInternetCheckRecordDomain;
+import com.xhpc.activity.domain.XhpcTradebillInternetCheckRecordDomain;
-import com.xhpc.tradebill.mapper.EtOrderMappingMapper;
+import com.xhpc.activity.mapper.XhpcHistoryOrderMapper;
-import com.xhpc.tradebill.mapper.XhpcHistoryOrderMapper;
+import com.xhpc.activity.mapper.XhpcTradebillInternetCheckRecordMapper;
-import com.xhpc.tradebill.mapper.XhpcTradebillInternetCheckRecordMapper;
+import com.xhpc.activity.service.InternetBillService;
-import com.xhpc.tradebill.service.InternetBillService;
+import com.xhpc.activity.utils.DownloadUtil;
-import com.xhpc.tradebill.utils.DownloadUtil;
+import com.xhpc.activity.vo.HDTradebillVo;
-import com.xhpc.tradebill.vo.HDTradebillVo;
+import com.xhpc.activity.vo.KDTradebillVo;
-import com.xhpc.tradebill.vo.KDTradebillVo;
+import com.xhpc.activity.vo.XDTTradebillVo;
-import com.xhpc.tradebill.vo.XDTTradebillVo;
+import com.xhpc.activity.vo.XJTradeBillVo;
-import com.xhpc.tradebill.vo.XJTradeBillVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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.activity.mapper.XhpcDeviceMessageMapper;
-import com.xhpc.log.mapper.XhpcHistoryOrderMapper;
+import com.xhpc.activity.mapper.XhpcHistoryOrderMapper;
-import com.xhpc.log.mapper.XhpcMessageMapper;
+import com.xhpc.activity.service.OrderLogService;
-import com.xhpc.log.service.OrderLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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.activity.domain.XhpcTradebillPaymentCheckRecordDomain;
-import com.xhpc.tradebill.mapper.XhpcRechargeOrderMapper;
+import com.xhpc.activity.mapper.XhpcRechargeOrderMapper;
-import com.xhpc.tradebill.mapper.XhpcRefundOrderMapper;
+import com.xhpc.activity.mapper.XhpcRefundOrderMapper;
-import com.xhpc.tradebill.mapper.XhpcTradebillPaymentCheckRecordMapper;
+import com.xhpc.activity.mapper.XhpcTradebillPaymentCheckRecordMapper;
-import com.xhpc.tradebill.service.PaymentBillService;
+import com.xhpc.activity.service.PaymentBillService;
-import com.xhpc.tradebill.utils.DownloadUtil;
+import com.xhpc.activity.utils.DownloadUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tools.zip.ZipEntry;
 import org.apache.tools.zip.ZipFile;

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.activity.mapper.XhpcChargingPileMapper;
-import com.xhpc.log.mapper.XhpcDeviceMessageMapper;
+import com.xhpc.activity.mapper.XhpcDeviceMessageMapper;
-import com.xhpc.log.service.PileLogService;
+import com.xhpc.activity.service.PileLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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.activity.mapper.XhpcChargingStationMapper;
-import com.xhpc.log.service.StationLogService;
+import com.xhpc.activity.service.StationLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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.activity.mapper.SysOperLogMapper;
-import com.xhpc.log.service.SystemLogService;
+import com.xhpc.activity.service.SystemLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

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.activity.domain.*;
-import com.xhpc.workorder.mapper.*;
+import com.xhpc.activity.mapper.*;
-import com.xhpc.workorder.service.WorkOrderService;
+import com.xhpc.activity.service.WorkOrderService;
-import com.xhpc.workorder.service.WorkUserService;
+import com.xhpc.activity.service.WorkUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

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.activity.domain.XhpcStationDeviceDomain;
-import com.xhpc.workorder.domain.XhpcWorkStationDomain;
+import com.xhpc.activity.domain.XhpcWorkStationDomain;
-import com.xhpc.workorder.mapper.XhpcStationDeviceMapper;
+import com.xhpc.activity.mapper.XhpcStationDeviceMapper;
-import com.xhpc.workorder.mapper.XhpcWorkStationMapper;
+import com.xhpc.activity.mapper.XhpcWorkStationMapper;
-import com.xhpc.workorder.service.WorkStationService;
+import com.xhpc.activity.service.WorkStationService;
-import com.xhpc.workorder.vo.XhpcStationDeviceVo;
+import com.xhpc.activity.vo.XhpcStationDeviceVo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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.activity.domain.XhpcWorkTypeDictDomain;
-import com.xhpc.workorder.mapper.XhpcWorkTypeDictMapper;
+import com.xhpc.activity.mapper.XhpcWorkTypeDictMapper;
-import com.xhpc.workorder.service.WorkTypeService;
+import com.xhpc.activity.service.WorkTypeService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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.activity.domain.XhpcWorkUserDomain;
-import com.xhpc.workorder.mapper.XhpcWorkDeptMapper;
+import com.xhpc.activity.mapper.XhpcWorkDeptMapper;
-import com.xhpc.workorder.mapper.XhpcWorkUserMapper;
+import com.xhpc.activity.mapper.XhpcWorkUserMapper;
-import com.xhpc.workorder.service.WorkUserService;
+import com.xhpc.activity.service.WorkUserService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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.activity.domain.XhpcClearingBankDomain;
-import com.xhpc.clearing.mapper.XhpcClearingBankMapper;
+import com.xhpc.activity.mapper.XhpcClearingBankMapper;
-import com.xhpc.clearing.service.XhpcClearingBankService;
+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;

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.activity.config.AliOSSProperties;
-import com.xhpc.clearing.config.AliOSSProperties;
+import com.xhpc.activity.domain.XhpcClearingBankDomain;
-import com.xhpc.clearing.domain.XhpcClearingBankDomain;
+import com.xhpc.activity.domain.XhpcClearingCheckoutDomain;
-import com.xhpc.clearing.domain.XhpcClearingCheckoutDomain;
+import com.xhpc.activity.domain.XhpcClearingHistoryOrderDomain;
-import com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain;
+import com.xhpc.activity.domain.XhpcClearingReceiptDomain;
-import com.xhpc.clearing.domain.XhpcClearingReceiptDomain;
+import com.xhpc.activity.mapper.XhpcClearingBankMapper;
-import com.xhpc.clearing.mapper.XhpcClearingBankMapper;
+import com.xhpc.activity.mapper.XhpcClearingCheckoutMapper;
-import com.xhpc.clearing.mapper.XhpcClearingCheckoutMapper;
+import com.xhpc.activity.mapper.XhpcClearingHistoryOrderMapper;
-import com.xhpc.clearing.mapper.XhpcClearingHistoryOrderMapper;
+import com.xhpc.activity.mapper.XhpcClearingReceiptMapper;
-import com.xhpc.clearing.mapper.XhpcClearingReceiptMapper;
+import com.xhpc.activity.service.XhpcClearingCheckoutService;
-import com.xhpc.clearing.service.XhpcClearingCheckoutService;
+import com.xhpc.activity.utils.DownloadUtil;
-import com.xhpc.clearing.utils.DownloadUtil;
+import com.xhpc.activity.vo.CheckoutBankVo;
-import com.xhpc.clearing.vo.CheckoutBankVo;
+import com.xhpc.activity.vo.ClearingReceiptVo;
-import com.xhpc.clearing.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;
 

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.activity.domain.XhpcClearingHistoryOrderDomain;
-import com.xhpc.clearing.domain.XhpcClearingBankDomain;
+import com.xhpc.activity.mapper.XhpcClearingBankMapper;
-import com.xhpc.clearing.domain.XhpcClearingHistoryOrderDomain;
+import com.xhpc.activity.mapper.XhpcClearingCheckoutMapper;
-import com.xhpc.clearing.mapper.XhpcClearingBankMapper;
+import com.xhpc.activity.mapper.XhpcClearingHistoryOrderMapper;
-import com.xhpc.clearing.mapper.XhpcClearingCheckoutMapper;
+import com.xhpc.activity.mapper.XhpcHistoryOrderMapper;
-import com.xhpc.clearing.mapper.XhpcClearingHistoryOrderMapper;
+import com.xhpc.activity.service.XhpcClearingHistoryOrderService;
-import com.xhpc.clearing.mapper.XhpcHistoryOrderMapper;
+import com.xhpc.activity.vo.ClearingOrderVo;
-import com.xhpc.clearing.service.XhpcClearingHistoryOrderService;
-import com.xhpc.clearing.vo.ClearingOrderVo;
 import com.xhpc.common.core.exception.CustomException;
 import com.xhpc.common.core.utils.StringUtils;
 import org.springframework.stereotype.Service;

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;
 

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.activity.domain.XhpcClearingHistoryOrderDomain;
-import com.xhpc.clearing.domain.XhpcHistoryOrderDomain;
+import com.xhpc.activity.domain.XhpcHistoryOrderDomain;
-import com.xhpc.clearing.mapper.XhpcClearingHistoryOrderMapper;
+import com.xhpc.activity.mapper.XhpcClearingHistoryOrderMapper;
-import com.xhpc.clearing.mapper.XhpcHistoryOrderMapper;
+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;

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;

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;

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 {
 

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;
 

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;

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;