feat: 完善视频号售后端点模型

Author: binarywang

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelAfterSaleServiceImpl.java

@@ -163,14 +163,14 @@ public WxChannelBaseResponse handleFastExchangeReceipt(AfterSaleHandleFastExchan
 
   @Override
   public GuaranteeOrderResponse getGuaranteeOrder(String guaranteeOrderId) throws WxErrorException {
-    GuaranteeOrderIdParam param = new GuaranteeOrderIdParam(guaranteeOrderId);
+    GuaranteeIdParam param = new GuaranteeIdParam(guaranteeOrderId);
     String resJson = shopService.post(AFTER_SALE_GET_GUARANTEE_ORDER_URL, param);
     return ResponseUtils.decode(resJson, GuaranteeOrderResponse.class);
   }
 
   @Override
   public WxChannelBaseResponse merchantAcceptGuarantee(String guaranteeOrderId) throws WxErrorException {
-    GuaranteeOrderIdParam param = new GuaranteeOrderIdParam(guaranteeOrderId);
+    GuaranteeIdParam param = new GuaranteeIdParam(guaranteeOrderId);
     String resJson = shopService.post(AFTER_SALE_MERCHANT_ACCEPT_GUARANTEE_URL, param);
     return ResponseUtils.decode(resJson, WxChannelBaseResponse.class);
   }

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/AfterSaleCreateResponse.java

@@ -10,6 +10,6 @@
 public class AfterSaleCreateResponse extends WxChannelBaseResponse {
   private static final long serialVersionUID = 2680676438284658410L;
 
-  @JsonProperty("aftersale_id")
-  private String afterSaleId;
+  @JsonProperty("after_sale_order_id")
+  private String afterSaleOrderId;
 }

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/AfterSaleGenAfterSaleOrderParam.java

@@ -19,4 +19,7 @@ public class AfterSaleGenAfterSaleOrderParam extends AfterSaleRefundPriceDiffPar
 
   @JsonProperty("address_id")
   private String addressId;
+
+  @JsonProperty("exchange_sku_info")
+  private ExchangeSkuInfo exchangeSkuInfo;
 }

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/AfterSaleHandleFastExchangeReceiptParam.java

@@ -25,5 +25,5 @@ public class AfterSaleHandleFastExchangeReceiptParam extends AfterSaleIdParam {
   private String merchantText;
 
   @JsonProperty("reject_confirm_exchange")
-  private List<Object> rejectConfirmExchange;
+  private List<String> rejectConfirmExchange;
 }

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/ExchangeSkuInfo.java

@@ -0,0 +1,14 @@
+package me.chanjar.weixin.channel.bean.after;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ExchangeSkuInfo implements Serializable {
+  private static final long serialVersionUID = 1L;
+  @JsonProperty("new_sku_id")
+  private String newSkuId;
+}

…el/bean/after/GuaranteeOrderIdParam.java …channel/bean/after/GuaranteeIdParam.javaweixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/GuaranteeOrderIdParam.java renamed to weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/GuaranteeIdParam.java weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/GuaranteeOrderIdParam.java renamed to weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/GuaranteeIdParam.java

@@ -11,9 +11,8 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class GuaranteeOrderIdParam implements Serializable {
+public class GuaranteeIdParam implements Serializable {
   private static final long serialVersionUID = 4325797703077757139L;
-
-  @JsonProperty("guarantee_order_id")
-  private String guaranteeOrderId;
+  @JsonProperty("guarantee_id")
+  private String guaranteeId;
 }

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/GuaranteeInfo.java

@@ -0,0 +1,14 @@
+package me.chanjar.weixin.channel.bean.after;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class GuaranteeInfo implements Serializable {
+  private static final long serialVersionUID = 1L;
+  @JsonProperty("guarantee_id")
+  private String guaranteeId;
+}

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/GuaranteeMerchantModifyParam.java

@@ -8,7 +8,7 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class GuaranteeMerchantModifyParam extends GuaranteeOrderIdParam {
+public class GuaranteeMerchantModifyParam extends GuaranteeIdParam {
   private static final long serialVersionUID = 9193536167701367687L;
 
   @JsonProperty("bad_level")

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/GuaranteeMerchantProofParam.java

@@ -2,19 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class GuaranteeMerchantProofParam extends GuaranteeOrderIdParam {
+public class GuaranteeMerchantProofParam extends GuaranteeIdParam {
   private static final long serialVersionUID = -2365495841866160967L;
 
-  @JsonProperty("content")
-  private String content;
-
-  @JsonProperty("pic_list")
-  private List<String> picList;
+  @JsonProperty("proof_info")
+  private GuaranteeProofInfo proofInfo;
 }

weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/after/GuaranteeOrderResponse.java

@@ -1,7 +1,6 @@
 package me.chanjar.weixin.channel.bean.after;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse;
@@ -11,6 +10,6 @@
 public class GuaranteeOrderResponse extends WxChannelBaseResponse {
   private static final long serialVersionUID = 3977781489692530604L;
 
-  @JsonProperty("guarantee_order")
-  private JsonNode guaranteeOrder;
+  @JsonProperty("guarantee_info")
+  private GuaranteeInfo guaranteeInfo;
 }