重构版本

src/main/java/com/ost/micro/provider/common/ExcelBigUtils.java

@@ -4,8 +4,8 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.export.ExcelExportService;
 import com.google.gson.Gson;
-import com.ost.micro.core.pay.modules.sys.dto.BizTradeDetailDto;
-import com.ost.micro.core.pay.modules.sys.excel.BizTradeDetailBean;
+import com.ost.micro.modules.sys.dto.BizTradeDetailDto;
+import com.ost.micro.modules.sys.excel.BizTradeDetailBean;
 import com.ost.micro.core.utils.CopyDataUtil;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 

src/main/java/com/ost/micro/provider/common/FileUploadController.java

@@ -2,7 +2,7 @@ package com.ost.micro.provider.common;
 
 import com.ost.micro.common.utils.FileUploadUtil;
 import com.ost.micro.core.context.model.response.DataResponse;
-import com.ost.micro.core.pay.modules.sys.dto.FileUploadDto;
+import com.ost.micro.modules.sys.dto.FileUploadDto;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestParam;

src/main/java/com/ost/micro/provider/controller/CardApiController.java

 package com.ost.micro.provider.controller;
 
-import com.ost.micro.core.aop.DataToUnderline;
+import com.ost.micro.common.aop.DataToUnderline;
 import com.ost.micro.core.context.model.response.DataResponse;
-import com.ost.micro.core.pay.modules.cardservice.dto.passage.response.ApiResDto;
+import com.ost.micro.modules.cardservice.dto.passage.response.ApiResDto;
 import com.ost.micro.provider.common.PaymentServiceClient;
 import com.ost.micro.provider.common.ServiceUrl;
 import io.swagger.annotations.Api;

src/main/java/com/ost/micro/provider/controller/CardBankController.java

 package com.ost.micro.provider.controller;
 
-import com.ost.micro.core.aop.DataToUnderline;
+import com.ost.micro.common.aop.DataToUnderline;
 import com.ost.micro.core.context.model.response.DataResponse;
-import com.ost.micro.core.pay.modules.cardservice.dto.bank.response.BankResDto;
+import com.ost.micro.modules.cardservice.dto.bank.response.BankResDto;
 import com.ost.micro.provider.common.PaymentServiceClient;
 import com.ost.micro.provider.common.ServiceUrl;
 import io.swagger.annotations.Api;

src/main/java/com/ost/micro/provider/controller/CardBizController.java

 package com.ost.micro.provider.controller;
-import com.ost.micro.core.aop.DataToUnderline;
+import com.ost.micro.common.aop.DataToUnderline;
 import com.ost.micro.core.context.model.response.DataResponse;
-import com.ost.micro.core.pay.modules.cardservice.dto.biz.request.BizParamsReqDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.biz.request.BizReqDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.biz.response.BizResDto;
+import com.ost.micro.modules.cardservice.dto.biz.request.BizParamsReqDto;
+import com.ost.micro.modules.cardservice.dto.biz.request.BizReqDto;
+import com.ost.micro.modules.cardservice.dto.biz.response.BizResDto;
 import com.ost.micro.provider.common.PaymentServiceClient;
 import com.ost.micro.provider.common.ServiceUrl;
 import io.swagger.annotations.Api;

src/main/java/com/ost/micro/provider/controller/CardEquipmentController.java

 package com.ost.micro.provider.controller;
 
 import com.google.gson.internal.LinkedTreeMap;
-import com.ost.micro.core.aop.DataToUnderline;
+import com.ost.micro.common.aop.DataToUnderline;
 import com.ost.micro.core.contant.Result;
 import com.ost.micro.core.context.model.response.DataResponse;
 import com.ost.micro.core.exception.ServiceException;
-import com.ost.micro.core.pay.modules.cardservice.dto.equipment.request.EquipmentReqDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.equipment.request.EquipmentUpReqDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.equipment.request.ForwardingDeviceReqDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.equipment.request.ForwardingReqDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.equipment.response.EquipmentResDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.equipment.response.EquipmentUpResDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.equipment.response.ForwardingDeviceRespDto;
+import com.ost.micro.modules.cardservice.dto.equipment.request.EquipmentReqDto;
+import com.ost.micro.modules.cardservice.dto.equipment.request.EquipmentUpReqDto;
+import com.ost.micro.modules.cardservice.dto.equipment.request.ForwardingDeviceReqDto;
+import com.ost.micro.modules.cardservice.dto.equipment.request.ForwardingReqDto;
+import com.ost.micro.modules.cardservice.dto.equipment.response.EquipmentResDto;
+import com.ost.micro.modules.cardservice.dto.equipment.response.EquipmentUpResDto;
+import com.ost.micro.modules.cardservice.dto.equipment.response.ForwardingDeviceRespDto;
 import com.ost.micro.core.pay.resp.EventCode;
 import com.ost.micro.core.utils.FileHelper;
 import com.ost.micro.core.utils.GsonUtil;

src/main/java/com/ost/micro/provider/controller/CardOrderController.java

@@ -2,11 +2,11 @@ package com.ost.micro.provider.controller;
 
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
-import com.ost.micro.core.aop.DataToUnderline;
+import com.ost.micro.common.aop.DataToUnderline;
 import com.ost.micro.core.context.model.response.DataResponse;
-import com.ost.micro.core.pay.modules.cardservice.dto.order.request.OrderReqDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.order.response.OrderResDto;
-import com.ost.micro.core.pay.modules.cardservice.excel.OrderExcelDto;
+import com.ost.micro.modules.cardservice.dto.order.request.OrderReqDto;
+import com.ost.micro.modules.cardservice.dto.order.response.OrderResDto;
+import com.ost.micro.modules.cardservice.excel.OrderExcelDto;
 import com.ost.micro.core.utils.DateUtil;
 import com.ost.micro.core.utils.ExcelUtils;
 import com.ost.micro.provider.common.PaymentServiceClient;

src/main/java/com/ost/micro/provider/controller/CardOrderStaticsController.java

@@ -2,12 +2,12 @@ package com.ost.micro.provider.controller;
 
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
-import com.ost.micro.core.aop.DataToUnderline;
+import com.ost.micro.common.aop.DataToUnderline;
 import com.ost.micro.core.context.model.response.DataResponse;
-import com.ost.micro.core.pay.modules.cardservice.dto.order.response.OrderResDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.order.response.OrderStatisticsResDto;
-import com.ost.micro.core.pay.modules.cardservice.excel.OrderExcelDto;
-import com.ost.micro.core.pay.modules.cardservice.excel.OrderStatisticsExcelDto;
+import com.ost.micro.modules.cardservice.dto.order.response.OrderResDto;
+import com.ost.micro.modules.cardservice.dto.order.response.OrderStatisticsResDto;
+import com.ost.micro.modules.cardservice.excel.OrderExcelDto;
+import com.ost.micro.modules.cardservice.excel.OrderStatisticsExcelDto;
 import com.ost.micro.core.utils.DateUtil;
 import com.ost.micro.core.utils.ExcelUtils;
 import com.ost.micro.provider.common.PaymentServiceClient;

src/main/java/com/ost/micro/provider/controller/CardPassageController.java

 package com.ost.micro.provider.controller;
-import com.ost.micro.core.aop.DataToUnderline;
+import com.ost.micro.common.aop.DataToUnderline;
 import com.ost.micro.core.context.model.response.DataResponse;
-import com.ost.micro.core.pay.modules.cardservice.dto.passage.request.CheckLoginDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.passage.request.PassageReqDto;
-import com.ost.micro.core.pay.modules.cardservice.dto.passage.response.PassageResDto;
-import com.ost.micro.core.pay.modules.upload.UploadResult;
+import com.ost.micro.modules.cardservice.dto.passage.request.CheckLoginDto;
+import com.ost.micro.modules.cardservice.dto.passage.request.PassageReqDto;
+import com.ost.micro.modules.cardservice.dto.passage.response.PassageResDto;
+import com.ost.micro.modules.upload.UploadResult;
 import com.ost.micro.core.pay.resp.EventCode;
 import com.ost.micro.core.utils.GsonUtil;
 import com.ost.micro.core.utils.ResponseUtils;