[xuej@dev-server nos-vehicle-service (feature/20240813/merge-biz-service-for-compare)]$ git diff --shortstat feature/20240813/merge-biz-service-for-compare feature/20240813/merge-biz-service
618 files changed, 2822 insertions(+), 39382 deletions(-)
[xuej@dev-server nos-vehicle-service (feature/20240813/merge-biz-service-for-compare)]$ git diff --summary feature/20240813/merge-biz-service-for-compare feature/20240813/merge-biz-service
delete mode 100644 .factorypath
delete mode 100644 src/main/java/space/foolfish/core/biz/common/util/JsonComparator.java
delete mode 100644 src/main/java/space/foolfish/core/biz/common/util/ResultMapGenerator.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/alioth/vo/AliothEventMesgVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppCreateCreateOrderItemDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppCreateOrderDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppCreateOrderListDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeBodyDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeInfoBodyDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeInfoDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectOrderInfoDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppUpdateOrderBodyDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppUpdateOrderDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/dto/PackageOrderBindCouponDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoDataVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoPaymentsVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoRefundVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeListVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectOrderInfoListVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectOrderInfoVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppUpdateOrderVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppUpdateWishVo.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/PackageOrderBindCouponVO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/old/vo/RnullVO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/app/v1/param/CreateOrderParam.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/benefits/dto/ChargingRightsDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/benefits/dto/ChargingRightsListDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/benefits/vo/ChargingRightsVO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/blackmamba/BlackMambaCheckDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/cart/dto/CartAddDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/cart/dto/CartBatchUpdateDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/cart/dto/CartCreateOrderDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/cart/dto/CartSkuQueryDTO.java
delete mode 100644 src/main/java/space/foolfish/core/biz/domain/cart/vo/CartAddVO.java
[xuej@dev-server nos-vehicle-service (feature/20240813/merge-biz-service-for-compare)]$ git diff --numstat feature/20240813/merge-biz-service-for-compare feature/20240813/merge-biz-service
0 268 .factorypath
2 0 .gitignore
212 6 pom.xml
1 1 src/main/java/space/foolfish/core/biz/common/util/CommonConstant.java
0 321 src/main/java/space/foolfish/core/biz/common/util/JsonComparator.java
0 81 src/main/java/space/foolfish/core/biz/common/util/ResultMapGenerator.java
12 119 src/main/java/space/foolfish/core/biz/common/util/SerialNumberService.java
2 2 src/main/java/space/foolfish/core/biz/domain/SiebelBaseDTO.java
2 3 src/main/java/space/foolfish/core/biz/domain/SiebelBaseNewVO.java
2 11 src/main/java/space/foolfish/core/biz/domain/SiebelBaseVO.java
0 47 src/main/java/space/foolfish/core/biz/domain/alioth/vo/AliothEventMesgVo.java
0 15 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppCreateCreateOrderItemDTO.java
0 114 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppCreateOrderDTO.java
0 21 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppCreateOrderListDTO.java
0 49 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeBodyDTO.java
0 12 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeDTO.java
0 21 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeInfoBodyDTO.java
0 13 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeInfoDTO.java
0 31 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectOrderInfoDTO.java
0 27 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppUpdateOrderBodyDTO.java
0 12 src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppUpdateOrderDTO.java
12 10 src/main/java/space/foolfish/core/biz/domain/app/old/dto/MixOrderDTO.java
0 60 src/main/java/space/foolfish/core/biz/domain/app/old/dto/PackageOrderBindCouponDTO.java
0 8 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppBaseVO.java
0 152 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoDataVo.java
0 66 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoPaymentsVo.java
0 59 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoRefundVo.java
0 42 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoVo.java
0 79 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeListVo.java
0 38 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeVo.java
0 265 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectOrderInfoListVo.java
0 33 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectOrderInfoVo.java
0 31 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppUpdateOrderVo.java
0 24 src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppUpdateWishVo.java
8 8 src/main/java/space/foolfish/core/biz/domain/app/old/vo/OrderProductVO.java
0 65 src/main/java/space/foolfish/core/biz/domain/app/old/vo/PackageOrderBindCouponVO.java
1 3 src/main/java/space/foolfish/core/biz/domain/app/old/vo/ResultVO.java
[xuej@dev-server nos-vehicle-service (feature/20240813/merge-biz-service-for-compare)]$ git diff --stat feature/20240813/merge-biz-service-for-compare feature/20240813/merge-biz-service
.factorypath | 268 ------
.gitignore | 2 +
pom.xml | 218 ++++-
src/main/java/space/foolfish/core/biz/common/util/CommonConstant.java | 2 +-
src/main/java/space/foolfish/core/biz/common/util/JsonComparator.java | 321 -------
src/main/java/space/foolfish/core/biz/common/util/ResultMapGenerator.java | 81 --
src/main/java/space/foolfish/core/biz/common/util/SerialNumberService.java | 131 +--
src/main/java/space/foolfish/core/biz/domain/SiebelBaseDTO.java | 4 +-
src/main/java/space/foolfish/core/biz/domain/SiebelBaseNewVO.java | 5 +-
src/main/java/space/foolfish/core/biz/domain/SiebelBaseVO.java | 13 +-
src/main/java/space/foolfish/core/biz/domain/alioth/vo/AliothEventMesgVo.java | 47 -
src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppCreateCreateOrderItemDTO.java | 15 -
src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppCreateOrderDTO.java | 114 ---
src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppCreateOrderListDTO.java | 21 -
src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeBodyDTO.java | 49 --
src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeDTO.java | 12 -
src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeInfoBodyDTO.java | 21 -
src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectChargeInfoDTO.java | 13 -
src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppSelectOrderInfoDTO.java | 31 -
src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppUpdateOrderBodyDTO.java | 27 -
src/main/java/space/foolfish/core/biz/domain/app/old/dto/AppUpdateOrderDTO.java | 12 -
src/main/java/space/foolfish/core/biz/domain/app/old/dto/MixOrderDTO.java | 22 +-
src/main/java/space/foolfish/core/biz/domain/app/old/dto/PackageOrderBindCouponDTO.java | 60 --
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppBaseVO.java | 8 -
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoDataVo.java | 152 ----
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoPaymentsVo.java | 66 --
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoRefundVo.java | 59 --
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeInfoVo.java | 42 -
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeListVo.java | 79 --
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectChargeVo.java | 38 -
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectOrderInfoListVo.java | 265 ------
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppSelectOrderInfoVo.java | 33 -
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppUpdateOrderVo.java | 31 -
src/main/java/space/foolfish/core/biz/domain/app/old/vo/AppUpdateWishVo.java | 24 -
src/main/java/space/foolfish/core/biz/domain/app/old/vo/OrderProductVO.java | 16 +-
src/main/java/space/foolfish/core/biz/domain/app/old/vo/PackageOrderBindCouponVO.java | 65 --
src/main/java/space/foolfish/core/biz/domain/app/old/vo/ResultVO.java | 4 +-
[xuej@dev-server nos-vehicle-service (feature/20240813/merge-biz-service-for-compare)]$ git diff --diff-filter=A feature/20240813/merge-biz-service-for-compare feature/20240813/merge-biz-service
diff --git a/src/main/java/space/foolfish/vehicle/controller/converter/BatchQueryOrderStatusConverter.java b/src/main/java/space/foolfish/vehicle/controller/converter/BatchQueryOrderStatusConverter.java
new file mode 100644
index 0000000..1370ebc
--- /dev/null
+++ b/src/main/java/space/foolfish/vehicle/controller/converter/BatchQueryOrderStatusConverter.java
@@ -0,0 +1,21 @@
+package space.foolfish.vehicle.controller.converter;
+
+import java.util.List;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+import space.foolfish.vehicle.controller.model.BatchQueryOrderStatusResponse;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface BatchQueryOrderStatusConverter {
+ BatchQueryOrderStatusConverter INSTANCE = Mappers.getMapper(BatchQueryOrderStatusConverter.class);
+
+ @Mapping(target = "status", source = "orderStatus")
+ BatchQueryOrderStatusResponse.OrderStatus toOrderStatus(space.foolfish.vehicle.service.model.OrderStatus orderStatus);
+
+ List<BatchQueryOrderStatusResponse.OrderStatus> toOrderStatusList(List<space.foolfish.vehicle.service.model.OrderStatus> orderStatusList);
+
+}
diff --git a/src/main/java/space/foolfish/vehicle/controller/model/BatchQueryOrderStatusRequest.java b/src/main/java/space/foolfish/vehicle/controller/model/BatchQueryOrderStatusRequest.java
new file mode 100644
index 0000000..a520c07
--- /dev/null
+++ b/src/main/java/space/foolfish/vehicle/controller/model/BatchQueryOrderStatusRequest.java
@@ -0,0 +1,44 @@
+package space.foolfish.vehicle.controller.model;
+
[xuej@dev-server nos-vehicle-service (feature/20240813/merge-biz-service-for-compare)]$ git diff --diff-filter=D feature/20240813/merge-biz-service-for-compare feature/20240813/merge-biz-service
diff --git a/.factorypath b/.factorypath
deleted file mode 100644
index b9db479..0000000
--- a/.factorypath
+++ /dev/null
@@ -1,268 +0,0 @@
-<factorypath>
- <factorypathentry kind="VARJAR" id="M2_REPO/com/im/nos/nos-biz-service/20240730.01/nos-biz-service-20240730.01.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/com/im/nos/nos-common/20240730.01/nos-common-20240730.01.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-aop/2.6.2/spring-boot-starter-aop-2.6.2.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/aspectj/aspectjweaver/1.9.7/aspectjweaver-1.9.7.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/velocity/velocity-engine-core/2.0/velocity-engine-core-2.0.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-validation/2.6.2/spring-boot-starter-validation-2.6.2.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/hibernate/validator/hibernate-validator/6.2.0.Final/hibernate-validator-6.2.0.Final.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/validation/jakarta.validation-api/2.0.2/jakarta.validation-api-2.0.2.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/jboss/logging/jboss-logging/3.4.2.Final/jboss-logging-3.4.2.Final.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-data-redis/2.6.2/spring-boot-starter-data-redis-2.6.2.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-redis/2.6.0/spring-data-redis-2.6.0.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-keyvalue/2.6.0/spring-data-keyvalue-2.6.0.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/data/spring-data-commons/2.6.0/spring-data-commons-2.6.0.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-oxm/5.3.14/spring-oxm-5.3.14.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-context-support/5.3.14/spring-context-support-5.3.14.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/io/lettuce/lettuce-core/6.1.5.RELEASE/lettuce-core-6.1.5.RELEASE.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/com/alibaba/easyexcel/3.0.5/easyexcel-3.0.5.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi/4.1.2/poi-4.1.2.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-collections4/4.4/commons-collections4-4.4.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/commons/commons-compress/1.19/commons-compress-1.19.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/com/github/virtuald/curvesapi/1.06/curvesapi-1.06.jar" enabled="true" runInBatchMode="false"/>
- <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2.jar" enabled="true" runInBatchMode="false"/>
[xuej@dev-server nos-vehicle-service (feature/20240813/merge-biz-service-for-compare)]$ git diff --diff-filter=M feature/20240813/merge-biz-service-for-compare feature/20240813/merge-biz-service
diff --git a/.gitignore b/.gitignore
index 254f09b..5f9363b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ Thumbs.db
/target
log.path_IS_UNDEFINED
+/bin/
+/.factorypath
diff --git a/pom.xml b/pom.xml
index 8f47d7f..ac36650 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,14 +21,54 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+ <!-- automatically run annotation processors within the incremental compilation -->
+ <m2e.apt.activation>jdt_apt</m2e.apt.activation>
+ <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
+ <lombok.version>1.18.18</lombok.version>
+ <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
</properties>
<dependencies>
-
+ <!-- 对象转换 -->
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct</artifactId>
+ <version>${org.mapstruct.version}</version>
+ </dependency>
<dependency>
<groupId>com.im.nos</groupId>
- <artifactId>nos-biz-service</artifactId>
+ <artifactId>nos-common</artifactId>
[xuej@dev-server nos-vehicle-service (feature/20240813/merge-biz-service-for-compare)]$ git diff feature/20240813/merge-biz-service-for-compare feature/20240813/merge-biz-service -- src/main/java/space/foolfish/core/biz/domain/SiebelBaseNewVO.java
diff --git a/src/main/java/space/foolfish/core/biz/domain/SiebelBaseNewVO.java b/src/main/java/space/foolfish/core/biz/domain/SiebelBaseNewVO.java
index 8be523a..534fc22 100644
--- a/src/main/java/space/foolfish/core/biz/domain/SiebelBaseNewVO.java
+++ b/src/main/java/space/foolfish/core/biz/domain/SiebelBaseNewVO.java
@@ -2,10 +2,9 @@ package space.foolfish.core.biz.domain;
import space.foolfish.common.enums.MsgEnum;
import space.foolfish.common.util.DateNosUtils;
+
import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
/**
* @author: Jiang
[xuej@dev-server nos-vehicle-service (feature/20240813/merge-biz-service-for-compare)]$
