最新代码提交优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/api/contract/ContractApiImpl.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.trade.api.contract;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.module.trade.api.contract.dto.ContractApplyReqDTO;
 import com.yc.ship.module.trade.api.contract.dto.QueryContractRespDTO;
-import com.yc.ship.module.trade.serrvice.contract.ContractService;
+import com.yc.ship.module.trade.service.contract.ContractService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/api/insurance/InsuranceApiImpl.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.trade.api.insurance;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.module.trade.api.insurance.dto.InsuranceApplyReqDTO;
 import com.yc.ship.module.trade.api.insurance.dto.InsuredRespDTO;
-import com.yc.ship.module.trade.serrvice.insurance.InsuranceService;
+import com.yc.ship.module.trade.service.insurance.InsuranceService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/api/sms/SmsApiImpl.java

@@ -6,7 +6,7 @@ import com.yc.ship.module.trade.api.sms.dto.SmsReqDTO;
 import com.yc.ship.module.trade.api.sms.dto.SmsSendLogDTO;
 import com.yc.ship.module.trade.dal.dataobject.smsSendLog.SmsSendLogDO;
 import com.yc.ship.module.trade.dal.mysql.smsSendLog.SmsSendLogMapper;
-import com.yc.ship.module.trade.serrvice.sms.SmsServiceImpl;
+import com.yc.ship.module.trade.service.sms.SmsServiceImpl;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/contract/ContractController.java

@@ -11,7 +11,7 @@ import com.yc.ship.module.trade.controller.admin.contract.vo.ContractPageReqVO;
 import com.yc.ship.module.trade.controller.admin.contract.vo.ContractReqVO;
 import com.yc.ship.module.trade.controller.admin.contract.vo.ContractRespVO;
 import com.yc.ship.module.trade.dal.dataobject.contract.ContractDO;
-import com.yc.ship.module.trade.serrvice.contract.ContractService;
+import com.yc.ship.module.trade.service.contract.ContractService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/contract/vo/ContractNoticeReqVO.java

@@ -1,7 +1,7 @@
 package com.yc.ship.module.trade.controller.admin.contract.vo;
 
 import com.yc.ship.module.trade.api.contract.dto.ContractNoticeUrl;
-import com.yc.ship.module.trade.serrvice.contract.bo.ContractNoticeDataBO;
+import com.yc.ship.module.trade.service.contract.bo.ContractNoticeDataBO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/insurance/InsuranceController.java

@@ -10,7 +10,7 @@ import com.yc.ship.module.trade.api.insurance.dto.InsuranceApplyReqDTO;
 import com.yc.ship.module.trade.controller.admin.insurance.vo.InsurancePageReqVO;
 import com.yc.ship.module.trade.controller.admin.insurance.vo.InsuranceRespVO;
 import com.yc.ship.module.trade.dal.dataobject.insurance.InsuranceDO;
-import com.yc.ship.module.trade.serrvice.insurance.InsuranceService;
+import com.yc.ship.module.trade.service.insurance.InsuranceService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/invoice/InvoiceController.java

@@ -9,7 +9,7 @@ import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
 import com.yc.ship.module.trade.controller.admin.invoice.vo.InvoicePageReqVO;
 import com.yc.ship.module.trade.controller.admin.invoice.vo.InvoiceRespVO;
 import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDO;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceService;
+import com.yc.ship.module.trade.service.invoice.InvoiceService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/invoicelog/InvoiceLogController.java

@@ -9,7 +9,7 @@ import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
 import com.yc.ship.module.trade.controller.admin.invoicelog.vo.InvoiceLogPageReqVO;
 import com.yc.ship.module.trade.controller.admin.invoicelog.vo.InvoiceLogRespVO;
 import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceLogDO;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceLogService;
+import com.yc.ship.module.trade.service.invoice.InvoiceLogService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/smsProduct/SmsProductController.java

@@ -10,7 +10,7 @@ import com.yc.ship.module.trade.controller.admin.smsProduct.vo.SmsProductPageReq
 import com.yc.ship.module.trade.controller.admin.smsProduct.vo.SmsProductRespVO;
 import com.yc.ship.module.trade.controller.admin.smsProduct.vo.SmsProductSaveReqVO;
 import com.yc.ship.module.trade.dal.dataobject.smsProduct.SmsProductDO;
-import com.yc.ship.module.trade.serrvice.smsProduct.SmsProductService;
+import com.yc.ship.module.trade.service.smsProduct.SmsProductService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/smsSendLog/SmsSendLogController.java

@@ -10,7 +10,7 @@ import com.yc.ship.module.trade.controller.admin.smsSendLog.vo.SmsSendLogPageReq
 import com.yc.ship.module.trade.controller.admin.smsSendLog.vo.SmsSendLogRespVO;
 import com.yc.ship.module.trade.controller.admin.smsSendLog.vo.SmsSendLogSaveReqVO;
 import com.yc.ship.module.trade.dal.dataobject.smsSendLog.SmsSendLogDO;
-import com.yc.ship.module.trade.serrvice.smsSendLog.SmsSendLogService;
+import com.yc.ship.module.trade.service.smsSendLog.SmsSendLogService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/smsSendconfig/SmsSendconfigController.java

@@ -11,7 +11,7 @@ import com.yc.ship.module.trade.controller.admin.smsSendconfig.vo.SmsSendconfigQ
 import com.yc.ship.module.trade.controller.admin.smsSendconfig.vo.SmsSendconfigRespVO;
 import com.yc.ship.module.trade.controller.admin.smsSendconfig.vo.SmsSendconfigSaveReqVO;
 import com.yc.ship.module.trade.dal.dataobject.smsSendconfig.SmsSendconfigDO;
-import com.yc.ship.module.trade.serrvice.smsSendconfig.SmsSendconfigService;
+import com.yc.ship.module.trade.service.smsSendconfig.SmsSendconfigService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/contract/ContractStandardController.java

@@ -2,7 +2,7 @@ package com.yc.ship.module.trade.controller.app.contract;
 
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
 import com.yc.ship.module.trade.enums.ApiConstants;
-import com.yc.ship.module.trade.serrvice.contract.ContractService;
+import com.yc.ship.module.trade.service.contract.ContractService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.lang3.StringUtils;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/invoice/AppInvoiceController.java

@@ -4,11 +4,10 @@ import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.operatelog.core.annotations.OperateLog;
-import com.yc.ship.module.trade.api.invoice.dto.InvoicingReqDTO;
 import com.yc.ship.module.trade.controller.admin.invoice.vo.InvoicePageReqVO;
 import com.yc.ship.module.trade.controller.app.invoice.vo.AppInvoiceRespVO;
 import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDO;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceService;
+import com.yc.ship.module.trade.service.invoice.InvoiceService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/contract/ContractCommonService.java

@@ -1,10 +1,10 @@
-package com.yc.ship.module.trade.serrvice.contract;
+package com.yc.ship.module.trade.service.contract;
 
 
 import com.yc.ship.module.trade.api.contract.dto.InvokeResponse;
 import com.yc.ship.module.trade.api.contract.dto.QueryContractRespDTO;
 import com.yc.ship.module.trade.api.contract.dto.QueryContractResponse;
-import com.yc.ship.module.trade.serrvice.contract.bo.ContractApplyReqBO;
+import com.yc.ship.module.trade.service.contract.bo.ContractApplyReqBO;
 
 /**
  * @author aoxiang

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/contract/ContractCommonServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.contract;
+package com.yc.ship.module.trade.service.contract;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.json.JSONUtil;
@@ -8,7 +8,7 @@ import com.yc.ship.module.trade.api.contract.dto.InvokeResponse;
 import com.yc.ship.module.trade.api.contract.dto.QueryContractRespDTO;
 import com.yc.ship.module.trade.api.contract.dto.QueryContractResponse;
 import com.yc.ship.module.trade.enums.InvokeContractCodeEnum;
-import com.yc.ship.module.trade.serrvice.contract.bo.ContractApplyReqBO;
+import com.yc.ship.module.trade.service.contract.bo.ContractApplyReqBO;
 import com.yc.ship.module.trade.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/contract/ContractService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.contract;
+package com.yc.ship.module.trade.service.contract;
 
 
 import com.yc.ship.framework.common.pojo.CommonResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/contract/ContractServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.contract;
+package com.yc.ship.module.trade.service.contract;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
@@ -22,8 +22,8 @@ import com.yc.ship.module.trade.enums.ApiConstants;
 import com.yc.ship.module.trade.enums.ContractStatusEnum;
 import com.yc.ship.module.trade.enums.ErrorCodeConstants;
 import com.yc.ship.module.trade.enums.InvokeContractCodeEnum;
-import com.yc.ship.module.trade.serrvice.contract.bo.ContractApplyReqBO;
-import com.yc.ship.module.trade.serrvice.contract.bo.ContractNoticeDataBO;
+import com.yc.ship.module.trade.service.contract.bo.ContractApplyReqBO;
+import com.yc.ship.module.trade.service.contract.bo.ContractNoticeDataBO;
 import com.yc.ship.module.trade.utils.CommonUUCodeUtils;
 import com.yc.ship.module.trade.utils.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/contract/bo/ContractApplyReqBO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.contract.bo;
+package com.yc.ship.module.trade.service.contract.bo;
 
 
 import com.yc.ship.module.trade.api.contract.dto.*;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/contract/bo/ContractNoticeDataBO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.contract.bo;
+package com.yc.ship.module.trade.service.contract.bo;
 
 
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/insurance/InsuranceService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.insurance;
+package com.yc.ship.module.trade.service.insurance;
 
 
 import com.yc.ship.framework.common.pojo.CommonResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/insurance/InsuranceServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.insurance;
+package com.yc.ship.module.trade.service.insurance;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/InvoiceDetailService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoice;
+package com.yc.ship.module.trade.service.invoice;
 
 
 import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDetailDO;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/InvoiceGroupService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoice;
+package com.yc.ship.module.trade.service.invoice;
 
 
 import com.yc.ship.framework.common.pojo.CommonResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/InvoiceHangxinService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoice;
+package com.yc.ship.module.trade.service.invoice;
 
 import cn.hutool.json.JSONObject;
 import com.yc.ship.framework.common.pojo.CommonResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/InvoiceLogService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoice;
+package com.yc.ship.module.trade.service.invoice;
 
 
 import com.yc.ship.framework.common.pojo.PageResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/InvoiceService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoice;
+package com.yc.ship.module.trade.service.invoice;
 
 
 import com.yc.ship.framework.common.pojo.CommonResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/InvoiceSxlyService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoice;
+package com.yc.ship.module.trade.service.invoice;
 
 import cn.hutool.json.JSONObject;
 import com.yc.ship.framework.common.pojo.CommonResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/impl/InvoiceDetailServiceImpl.java

@@ -1,10 +1,9 @@
-package com.yc.ship.module.trade.serrvice.invoice.impl;
+package com.yc.ship.module.trade.service.invoice.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDetailDO;
 import com.yc.ship.module.trade.dal.mysql.invoice.InvoiceDetailMapper;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceDetailService;
+import com.yc.ship.module.trade.service.invoice.InvoiceDetailService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/impl/InvoiceGroupServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoice.impl;
+package com.yc.ship.module.trade.service.invoice.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -27,10 +27,10 @@ import com.yc.ship.module.trade.dal.dataobject.invoiceinventory.InvoiceInventory
 import com.yc.ship.module.trade.dal.mysql.invoice.InvoiceMapper;
 import com.yc.ship.module.trade.enums.invoice.DigitalInvoiceTypeEnum;
 import com.yc.ship.module.trade.enums.invoice.InvoiceStatusEnum;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceDetailService;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceGroupService;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceLogService;
-import com.yc.ship.module.trade.serrvice.invoiceinventory.InvoiceInventoryService;
+import com.yc.ship.module.trade.service.invoice.InvoiceDetailService;
+import com.yc.ship.module.trade.service.invoice.InvoiceGroupService;
+import com.yc.ship.module.trade.service.invoice.InvoiceLogService;
+import com.yc.ship.module.trade.service.invoiceinventory.InvoiceInventoryService;
 import com.yc.ship.module.trade.utils.GzipUtils;
 import com.yc.ship.module.trade.utils.TripleDesUtil;
 import lombok.extern.slf4j.Slf4j;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/impl/InvoiceHangxinServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoice.impl;
+package com.yc.ship.module.trade.service.invoice.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -17,10 +17,10 @@ import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDetailDO;
 import com.yc.ship.module.trade.dal.mysql.invoice.InvoiceMapper;
 import com.yc.ship.module.trade.enums.invoice.InvoiceStatusEnum;
 import com.yc.ship.module.trade.enums.invoice.InvoiceTypeEnum;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceDetailService;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceHangxinService;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceLogService;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceService;
+import com.yc.ship.module.trade.service.invoice.InvoiceDetailService;
+import com.yc.ship.module.trade.service.invoice.InvoiceHangxinService;
+import com.yc.ship.module.trade.service.invoice.InvoiceLogService;
+import com.yc.ship.module.trade.service.invoice.InvoiceService;
 import com.yc.ship.module.trade.utils.DESUtil;
 import com.yc.ship.module.trade.utils.HexUtil;
 import lombok.extern.slf4j.Slf4j;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/impl/InvoiceLogServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoice.impl;
+package com.yc.ship.module.trade.service.invoice.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.PageResult;
@@ -7,7 +7,7 @@ import com.yc.ship.module.trade.controller.admin.invoicelog.vo.InvoiceLogPageReq
 import com.yc.ship.module.trade.controller.admin.invoicelog.vo.InvoiceLogSaveReqVO;
 import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceLogDO;
 import com.yc.ship.module.trade.dal.mysql.invoice.InvoiceLogMapper;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceLogService;
+import com.yc.ship.module.trade.service.invoice.InvoiceLogService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/impl/InvoiceServiceImpl.java

@@ -1,15 +1,12 @@
-package com.yc.ship.module.trade.serrvice.invoice.impl;
+package com.yc.ship.module.trade.service.invoice.impl;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.thread.ThreadUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.lang.Asserts;
-import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -23,10 +20,10 @@ import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDO;
 import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDetailDO;
 import com.yc.ship.module.trade.dal.mysql.invoice.InvoiceMapper;
 import com.yc.ship.module.trade.enums.invoice.InvoiceStatusEnum;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceDetailService;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceGroupService;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceHangxinService;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceService;
+import com.yc.ship.module.trade.service.invoice.InvoiceDetailService;
+import com.yc.ship.module.trade.service.invoice.InvoiceGroupService;
+import com.yc.ship.module.trade.service.invoice.InvoiceHangxinService;
+import com.yc.ship.module.trade.service.invoice.InvoiceService;
 import com.yc.ship.module.trade.utils.AgencyAuthUtils;
 import com.yc.ship.module.trade.utils.ThreadLocalUtil;
 import com.yc.ship.module.trade.utils.TradeUUCodeUtils;
@@ -34,16 +31,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoice/impl/InvoiceSxlyServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoice.impl;
+package com.yc.ship.module.trade.service.invoice.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -15,9 +15,9 @@ import com.yc.ship.module.infra.api.config.ConfigApi;
 import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDO;
 import com.yc.ship.module.trade.enums.invoice.InvoiceStatusEnum;
 import com.yc.ship.module.trade.enums.invoice.InvoiceTypeEnum;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceLogService;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceService;
-import com.yc.ship.module.trade.serrvice.invoice.InvoiceSxlyService;
+import com.yc.ship.module.trade.service.invoice.InvoiceLogService;
+import com.yc.ship.module.trade.service.invoice.InvoiceService;
+import com.yc.ship.module.trade.service.invoice.InvoiceSxlyService;
 import com.yc.ship.module.trade.utils.DESUtil;
 import com.yc.ship.module.trade.utils.HexUtil;
 import lombok.extern.slf4j.Slf4j;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoiceinventory/InvoiceInventoryService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoiceinventory;
+package com.yc.ship.module.trade.service.invoiceinventory;
 
 
 import com.yc.ship.framework.common.pojo.PageResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/invoiceinventory/impl/InvoiceInventoryServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.invoiceinventory.impl;
+package com.yc.ship.module.trade.service.invoiceinventory.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.yc.ship.framework.common.pojo.PageResult;
@@ -7,7 +7,7 @@ import com.yc.ship.module.trade.controller.admin.invoice.inventory.InvoiceInvent
 import com.yc.ship.module.trade.controller.admin.invoice.inventory.InvoiceInventorySaveReqVO;
 import com.yc.ship.module.trade.dal.dataobject.invoiceinventory.InvoiceInventoryDO;
 import com.yc.ship.module.trade.dal.mysql.invoiceinventory.InvoiceInventoryMapper;
-import com.yc.ship.module.trade.serrvice.invoiceinventory.InvoiceInventoryService;
+import com.yc.ship.module.trade.service.invoiceinventory.InvoiceInventoryService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/sms/SmsService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.sms;
+package com.yc.ship.module.trade.service.sms;
 
 import com.yc.ship.module.trade.api.sms.dto.SmsReqDTO;
 import org.springframework.transaction.annotation.Transactional;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/sms/SmsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.sms;
+package com.yc.ship.module.trade.service.sms;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/smsProduct/SmsProductService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.smsProduct;
+package com.yc.ship.module.trade.service.smsProduct;
 
 
 import com.yc.ship.framework.common.pojo.PageResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/smsProduct/SmsProductServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.smsProduct;
+package com.yc.ship.module.trade.service.smsProduct;
 
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/smsSendLog/SmsSendLogService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.smsSendLog;
+package com.yc.ship.module.trade.service.smsSendLog;
 
 
 import com.yc.ship.framework.common.pojo.PageResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/smsSendLog/SmsSendLogServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.smsSendLog;
+package com.yc.ship.module.trade.service.smsSendLog;
 
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/smsSendconfig/SmsSendconfigService.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.smsSendconfig;
+package com.yc.ship.module.trade.service.smsSendconfig;
 
 
 import com.yc.ship.framework.common.pojo.PageResult;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/serrvice/smsSendconfig/SmsSendconfigServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.trade.serrvice.smsSendconfig;
+package com.yc.ship.module.trade.service.smsSendconfig;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
@@ -22,7 +22,7 @@ import com.yc.ship.module.trade.dal.dataobject.smsSendconfig.SmsSendconfigDO;
 import com.yc.ship.module.trade.dal.mysql.smsProduct.SmsProductMapper;
 import com.yc.ship.module.trade.dal.mysql.smsSendLog.SmsSendLogMapper;
 import com.yc.ship.module.trade.dal.mysql.smsSendconfig.SmsSendconfigMapper;
-import com.yc.ship.module.trade.serrvice.sms.SmsServiceImpl;
+import com.yc.ship.module.trade.service.sms.SmsServiceImpl;
 import com.yc.ship.module.trade.utils.SmsUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.httpclient.HttpClient;