From b65783bd726f469955db99df08cf8ee510d1d4d7 Mon Sep 17 00:00:00 2001 From: liming1019 Date: Mon, 23 Aug 2021 22:18:25 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E5=9C=A8=E4=BD=BF=E7=94=A8Request=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E6=97=B6=E7=94=B1lombok=E6=B3=A8=E8=A7=A3=E5=BC=95=E5=8F=91?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/WxMaShopAfterSaleAddRequest.java | 6 ++++++ .../request/WxMaShopAfterSaleGetRequest.java | 4 ++++ .../request/WxMaShopAfterSaleUpdateRequest.java | 4 ++++ .../shop/request/WxMaShopAuditBrandRequest.java | 8 ++++++++ .../request/WxMaShopAuditCategoryRequest.java | 6 ++++++ .../request/WxMaShopDeliveryRecieveRequest.java | 4 ++++ .../request/WxMaShopDeliverySendRequest.java | 6 ++++++ .../impl/WxMaShopAfterSaleServiceImplTest.java | 16 ++++++++-------- .../impl/WxMaShopDeliveryServiceImplTest.java | 11 +++++------ 9 files changed, 51 insertions(+), 14 deletions(-) diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleAddRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleAddRequest.java index 9f9c13e98..47c33f1ae 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleAddRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleAddRequest.java @@ -1,8 +1,10 @@ package cn.binarywang.wx.miniapp.bean.shop.request; import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.List; @@ -13,6 +15,8 @@ import java.util.List; */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class WxMaShopAfterSaleAddRequest implements Serializable { private static final long serialVersionUID = 6652525413062887786L; @@ -52,6 +56,8 @@ public class WxMaShopAfterSaleAddRequest implements Serializable { @Data @Builder + @NoArgsConstructor + @AllArgsConstructor public static class ProductInfosBean implements Serializable { /** * out_product_id : 234245 diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleGetRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleGetRequest.java index 31afee26c..fdad13ebb 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleGetRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleGetRequest.java @@ -1,8 +1,10 @@ package cn.binarywang.wx.miniapp.bean.shop.request; import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -12,6 +14,8 @@ import java.io.Serializable; */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class WxMaShopAfterSaleGetRequest implements Serializable { private static final long serialVersionUID = -1275475147400719521L; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleUpdateRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleUpdateRequest.java index 8bbeadb1a..d208b239e 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleUpdateRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleUpdateRequest.java @@ -1,8 +1,10 @@ package cn.binarywang.wx.miniapp.bean.shop.request; import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -12,6 +14,8 @@ import java.io.Serializable; */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class WxMaShopAfterSaleUpdateRequest implements Serializable { private static final long serialVersionUID = 2712027510252221370L; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAuditBrandRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAuditBrandRequest.java index fec5e3ee5..f589f503f 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAuditBrandRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAuditBrandRequest.java @@ -1,8 +1,10 @@ package cn.binarywang.wx.miniapp.bean.shop.request; import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.List; @@ -13,6 +15,8 @@ import java.util.List; */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class WxMaShopAuditBrandRequest implements Serializable { private static final long serialVersionUID = -969331692973992066L; @@ -25,6 +29,8 @@ public class WxMaShopAuditBrandRequest implements Serializable { @Data @Builder + @NoArgsConstructor + @AllArgsConstructor public static class AuditReqBean implements Serializable { /** * license : ["https://img.zhls.qq.com/3/609b98f7e0ff43d59ce6d9cca636c3e0.jpg"] @@ -38,6 +44,8 @@ public class WxMaShopAuditBrandRequest implements Serializable { @Data @Builder + @NoArgsConstructor + @AllArgsConstructor public static class BrandInfoBean implements Serializable { /** * brand_audit_type : 1 diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAuditCategoryRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAuditCategoryRequest.java index 8fe40176c..300c77db7 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAuditCategoryRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAuditCategoryRequest.java @@ -1,8 +1,10 @@ package cn.binarywang.wx.miniapp.bean.shop.request; import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.List; @@ -13,6 +15,8 @@ import java.util.List; */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class WxMaShopAuditCategoryRequest implements Serializable { private static final long serialVersionUID = -6730876344556487071L; @@ -25,6 +29,8 @@ public class WxMaShopAuditCategoryRequest implements Serializable { @Data @Builder + @NoArgsConstructor + @AllArgsConstructor public static class AuditReqBean implements Serializable { /** * license : ["www.xxxxx.com"] diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopDeliveryRecieveRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopDeliveryRecieveRequest.java index 50ef7a63e..bbf896626 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopDeliveryRecieveRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopDeliveryRecieveRequest.java @@ -1,8 +1,10 @@ package cn.binarywang.wx.miniapp.bean.shop.request; import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -12,6 +14,8 @@ import java.io.Serializable; */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class WxMaShopDeliveryRecieveRequest implements Serializable { private static final long serialVersionUID = 1540854758624081221L; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopDeliverySendRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopDeliverySendRequest.java index 6636b6405..bf8acced5 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopDeliverySendRequest.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopDeliverySendRequest.java @@ -1,8 +1,10 @@ package cn.binarywang.wx.miniapp.bean.shop.request; import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.List; @@ -13,6 +15,8 @@ import java.util.List; */ @Data @Builder +@NoArgsConstructor +@AllArgsConstructor public class WxMaShopDeliverySendRequest implements Serializable { private static final long serialVersionUID = -4034672301224469057L; @@ -37,6 +41,8 @@ public class WxMaShopDeliverySendRequest implements Serializable { @Data @Builder + @NoArgsConstructor + @AllArgsConstructor public static class DeliveryListBean implements Serializable { /** * delivery_id : SF diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopAfterSaleServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopAfterSaleServiceImplTest.java index 3d38d82e0..75538a151 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopAfterSaleServiceImplTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopAfterSaleServiceImplTest.java @@ -29,19 +29,19 @@ public class WxMaShopAfterSaleServiceImplTest { @Test public void testAdd() throws WxErrorException { WxMaShopAfterSaleAddRequest.ProductInfosBean productInfosBean = WxMaShopAfterSaleAddRequest.ProductInfosBean.builder() - .outProductId("234245") - .outSkuId("23424") - .productCnt(5) + .outProductId("19030") + .outSkuId("123266") + .productCnt(1) .build(); WxMaShopAfterSaleAddRequest request = WxMaShopAfterSaleAddRequest.builder() - .outOrderId("xxxxx") - .outAftersaleId("xxxxxx") - .openid("oTVP50O53a7jgmawAmxKukNlq3XI") + .outOrderId("318070290792415232X") + .outAftersaleId("318092069606883328X") + .openid("odIi15CuQ0IQviqsnUMy6CKNetrMX") .type(1) - .createTime("2020-12-01 00:00:00") + .createTime("2021-08-20 00:00:00") .status(1) .finishAllAftersale(0) - .path("/pages/aftersale.html?out_aftersale_id=xxxxx") + .path("/pages/aftersale.html?out_aftersale_id=318092069606883328X") .refund(100L) .productInfos(new ArrayList<>(Arrays.asList(productInfosBean))) .build(); diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopDeliveryServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopDeliveryServiceImplTest.java index e19a9c086..ab27cbdeb 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopDeliveryServiceImplTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopDeliveryServiceImplTest.java @@ -34,14 +34,13 @@ public class WxMaShopDeliveryServiceImplTest { @Test public void testSend() throws WxErrorException { WxMaShopDeliverySendRequest.DeliveryListBean deliveryListBean = WxMaShopDeliverySendRequest.DeliveryListBean.builder() - .deliveryId("SF") - .waybillId("23424324253") + .deliveryId("ZTO") + .waybillId("73164691843558") .build(); WxMaShopDeliverySendRequest request = WxMaShopDeliverySendRequest.builder() - .orderId(123456L) - .outOrderId("xxxxx") - .openid("oTVP50O53a7jgmawAmxKukNlq3XI") - .finishAllDelivery(0) + .outOrderId("318070290792415232") + .openid("odIi15CuQ0IQviqsnUMy6CKNetrM") + .finishAllDelivery(1) .deliveryList(new ArrayList<>(Arrays.asList(deliveryListBean))) .build(); WxMaShopBaseResponse response = wxService.getShopDeliveryService().send(request);