Просмотр исходного кода

:art: 修复客户端在使用Request对象时由lombok注解引发的错误

liming1019 3 лет назад
Родитель
Сommit
b65783bd72

+ 6 - 0
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

+ 4 - 0
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;
 

+ 4 - 0
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;
 

+ 8 - 0
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

+ 6 - 0
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"]

+ 4 - 0
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;
 

+ 6 - 0
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

+ 8 - 8
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();

+ 5 - 6
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);