Merge remote-tracking branch 'origin/master'

2025-04-13 17:41:20 +08:00 · 2025-04-13 17:41:20 +08:00 · 0f46cb0389
commit 0f46cb0389
parent 3a70f3fc25 ddb7392b16
309 changed files with 351 additions and 12469 deletions
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/AddrApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/AddrApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/CategoryApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/CategoryApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/CouponApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/CouponApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/DeliverApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/DeliverApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/GiveawayApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/GiveawayApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/PayApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/PayApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/ProductApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/ProductApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/SeckillApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/amount/SeckillApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/LoginApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/LoginApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/MemberShipApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/MemberShipApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/UserApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/UserApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/UserLoginApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/login/UserLoginApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/ComboApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/ComboApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/CouponApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/CouponApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DiscountApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DiscountApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DistributionProdApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/DistributionProdApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/GiveawayApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/GiveawayApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/GroupApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/GroupApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/LiveApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/LiveApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/SeckillApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/marketing/SeckillApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/CommentApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/CommentApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/MyOrderApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/MyOrderApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/OrderApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/OrderApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/OrderRefundApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/OrderRefundApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/SettlementApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/SettlementApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopCartApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopCartApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopOrderRefundApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopOrderRefundApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopStationApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/ShopStationApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/StationApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/order/StationApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformProductApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformProductApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformTransportApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformTransportApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformWalletApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/PlatformWalletApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreConfigApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreConfigApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreOrderApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreOrderApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreProductApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/ScoreProductApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserLevelApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserLevelApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserRightsApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/platform/UserRightsApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/SameCityApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/SameCityApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopNoticeApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopNoticeApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopRefundAddrApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopRefundAddrApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopSubstituteSalesApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopSubstituteSalesApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopWalletApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/ShopWalletApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/SkuApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/SkuApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/TransportApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/store/TransportApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierOrderApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierOrderApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierProductApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierProductApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierRefundAddrApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierRefundAddrApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierRefundApi.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/api/supplier/SupplierRefundApi.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/constants/Constant.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/constants/Constant.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/amount/OfflineHandleEventDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/amount/OfflineHandleEventDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/amount/PreSaleSpuData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/amount/PreSaleSpuData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/amount/SpuData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/amount/SpuData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/amount/UserAddrDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/amount/UserAddrDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/ComboData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/ComboData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/CouponData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/CouponData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/DiscountData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/DiscountData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/DistributionProdData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/DistributionProdData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/GiveawayData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/GiveawayData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/GroupData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/GroupData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/LiveData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/LiveData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/SeckillData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/marketing/SeckillData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/DeliveryOrderDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/DeliveryOrderDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderAddrDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderAddrDtoData.java
@ -3,7 +3,7 @@ package com.tmerclub.cloud.systemtest.data.order;
 import com.tmerclub.cloud.common.order.vo.OrderAddrVO;
 import com.tmerclub.cloud.common.order.vo.OrderVO;
 import com.tmerclub.cloud.order.dto.OrderAddrDTO;
-import com.moyuer.cloud.systemtest.api.order.OrderApi;
+import com.tmerclub.cloud.systemtest.api.order.OrderApi;

 /**
 * @author Tu
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderAdminDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderAdminDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderRefundDeliveryDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderRefundDeliveryDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderRefundDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderRefundDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderSelfStationDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderSelfStationDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderVirtualInfoDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/OrderVirtualInfoDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/PayParamData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/PayParamData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/ShopCartData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/ShopCartData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/ShopOrderRefundDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/ShopOrderRefundDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/SpuCommDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/SpuCommDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/SubmitOrderDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/SubmitOrderDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/WalletAssert.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/order/WalletAssert.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/CategoryDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/CategoryDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/DeliveryScoreOrderDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/DeliveryScoreOrderDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/PlatformDeliveryData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/PlatformDeliveryData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/ScoreConfigDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/ScoreConfigDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/ScoreOrderDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/ScoreOrderDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/ScoreSpuData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/ScoreSpuData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/SubmitScoreOrderDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/SubmitScoreOrderDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/UserLevelDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/UserLevelDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/UserRightsDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/platform/UserRightsDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/DeliveryData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/DeliveryData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/SameCityDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/SameCityDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/ShopRefundAddrDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/ShopRefundAddrDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/ShopStationDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/ShopStationDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/ShopSubstituteSalesDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/ShopSubstituteSalesDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/SpuPageSearchDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/store/SpuPageSearchDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/supplier/SupplierOrderRefundDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/supplier/SupplierOrderRefundDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/supplier/SupplierProductData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/supplier/SupplierProductData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/supplier/SupplierRefundAddrDtoData.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/data/supplier/SupplierRefundAddrDtoData.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/amount/CouponAmountTest.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/amount/CouponAmountTest.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/amount/DiscountAmountTest.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/amount/DiscountAmountTest.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/amount/FreightTest.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/amount/FreightTest.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/amount/MemberAmountTest.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/amount/MemberAmountTest.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/amount/MultipleDiscountsAmountTest.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/amount/MultipleDiscountsAmountTest.java
--- a/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/marketing/ComboTest.java
+++ b/system-test/src/main/java/com/tmerclub/cloud/systemtest/test/marketing/ComboTest.java
--- a/Show More
+++ b/Show More