fix: 修正保障单接口字段契约

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 {
-    GuaranteeIdParam param = new GuaranteeIdParam(guaranteeOrderId);
+    GuaranteeOrderIdParam param = new GuaranteeOrderIdParam(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 {
-    GuaranteeIdParam param = new GuaranteeIdParam(guaranteeOrderId);
+    GuaranteeOrderIdParam param = new GuaranteeOrderIdParam(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/GuaranteeInfo.java

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

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

@@ -8,9 +8,12 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class GuaranteeMerchantProofParam extends GuaranteeIdParam {
+public class GuaranteeMerchantProofParam extends GuaranteeOrderIdParam {
   private static final long serialVersionUID = -2365495841866160967L;
 
-  @JsonProperty("proof_info")
-  private GuaranteeProofInfo proofInfo;
+  @JsonProperty("content")
+  private String content;
+
+  @JsonProperty("pic_list")
+  private java.util.List<String> picList;
 }

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

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

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

@@ -1,6 +1,7 @@
 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;
@@ -10,6 +11,6 @@
 public class GuaranteeOrderResponse extends WxChannelBaseResponse {
   private static final long serialVersionUID = 3977781489692530604L;
 
-  @JsonProperty("guarantee_info")
-  private GuaranteeInfo guaranteeInfo;
+  @JsonProperty("guarantee_order")
+  private JsonNode guaranteeOrder;
 }

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

@@ -21,7 +21,6 @@
 import me.chanjar.weixin.channel.bean.after.AfterSaleVirtualTelNumResponse;
 import me.chanjar.weixin.channel.bean.after.GuaranteeMerchantModifyParam;
 import me.chanjar.weixin.channel.bean.after.GuaranteeMerchantProofParam;
-import me.chanjar.weixin.channel.bean.after.GuaranteeProofInfo;
 import me.chanjar.weixin.channel.bean.after.GuaranteeOrderResponse;
 import me.chanjar.weixin.channel.bean.after.SyncWorkOrderParam;
 import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse;
@@ -222,7 +221,7 @@ public void testMerchantAcceptGuarantee() throws WxErrorException {
   public void testMerchantModifyGuarantee() throws WxErrorException {
     WxChannelAfterSaleService afterSaleService = channelService.getAfterSaleService();
     GuaranteeMerchantModifyParam param = new GuaranteeMerchantModifyParam();
-    param.setGuaranteeId("");
+    param.setGuaranteeOrderId("");
     param.setBadLevel(10);
     param.setMerchantRemark("remark");
     WxChannelBaseResponse response = afterSaleService.merchantModifyGuarantee(param);
@@ -234,11 +233,9 @@ public void testMerchantModifyGuarantee() throws WxErrorException {
   public void testMerchantProofGuarantee() throws WxErrorException {
     WxChannelAfterSaleService afterSaleService = channelService.getAfterSaleService();
     GuaranteeMerchantProofParam param = new GuaranteeMerchantProofParam();
-    param.setGuaranteeId("");
-    GuaranteeProofInfo proofInfo = new GuaranteeProofInfo();
-    proofInfo.setText("proof");
-    proofInfo.setImageIds(new ArrayList<>(4));
-    param.setProofInfo(proofInfo);
+    param.setGuaranteeOrderId("");
+    param.setContent("proof");
+    param.setPicList(new ArrayList<>(4));
     WxChannelBaseResponse response = afterSaleService.merchantProofGuarantee(param);
     assertNotNull(response);
     assertTrue(response.isSuccess());

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

@@ -20,20 +20,20 @@ public void shouldUseOfficialAfterSaleAndGuaranteeFieldNames() throws Exception
     AfterSaleHandleFastExchangeReceiptParam receiptParam = new AfterSaleHandleFastExchangeReceiptParam();
     receiptParam.setRejectConfirmExchange(Collections.singletonList("media-1"));
 
-    GuaranteeIdParam guaranteeParam = new GuaranteeIdParam("guarantee-1");
+    GuaranteeOrderIdParam guaranteeParam = new GuaranteeOrderIdParam("guarantee-1");
     assertTrue(OBJECT_MAPPER.writeValueAsString(afterSaleParam).contains("\"exchange_sku_info\":{\"new_sku_id\":\"new-sku\"}"));
     assertTrue(OBJECT_MAPPER.writeValueAsString(receiptParam).contains("\"reject_confirm_exchange\":[\"media-1\"]"));
-    assertTrue(OBJECT_MAPPER.writeValueAsString(guaranteeParam).contains("\"guarantee_id\":\"guarantee-1\""));
+    assertTrue(OBJECT_MAPPER.writeValueAsString(guaranteeParam).contains("\"guarantee_order_id\":\"guarantee-1\""));
   }
 
   @Test
   public void shouldDecodeOfficialResponseFields() throws Exception {
     AfterSaleCreateResponse createResponse = OBJECT_MAPPER.readValue(
         "{\"errcode\":0,\"after_sale_order_id\":\"after-1\"}", AfterSaleCreateResponse.class);
     GuaranteeOrderResponse guaranteeResponse = OBJECT_MAPPER.readValue(
-        "{\"errcode\":0,\"guarantee_info\":{\"guarantee_id\":\"guarantee-1\"}}", GuaranteeOrderResponse.class);
+        "{\"errcode\":0,\"guarantee_order\":{\"guarantee_order_id\":\"guarantee-1\"}}", GuaranteeOrderResponse.class);
 
     assertEquals(createResponse.getAfterSaleOrderId(), "after-1");
-    assertEquals(guaranteeResponse.getGuaranteeInfo().getGuaranteeId(), "guarantee-1");
+    assertEquals(guaranteeResponse.getGuaranteeOrder().get("guarantee_order_id").asText(), "guarantee-1");
   }
 }

weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelAfterSaleServiceImplTest.java

@@ -14,6 +14,7 @@
       <class name="me.chanjar.weixin.channel.util.XmlUtilsTest"/>
       <class name="me.chanjar.weixin.channel.util.WxChCryptUtilsTest"/>
       <class name="me.chanjar.weixin.channel.util.ResponseUtilsTest"/>
+      <class name="me.chanjar.weixin.channel.bean.after.AfterSaleContractTest"/>
     </classes>
   </test>
 </suite>