售后单接口补全

Signed-off-by: wanglei <lei.wang@xianbb.cn>
binarywang · binarywang · Jul 26, 2022 · Jan 26, 2022 · Jan 26, 2022 · Feb 10, 2022
commit 547f889101777b1436bf3aedee4d4b7576f3be75
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaShopAfterSaleService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaShopAfterSaleService.java
@@ -1,9 +1,15 @@
 package cn.binarywang.wx.miniapp.api;
 
+import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAcceptReturnRequest;
 import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleAddRequest;
 import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleGetRequest;
+import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleListRequest;
 import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleUpdateRequest;
+import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleUploadReturnInfoRequest;
+import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopUploadCerficatesRequest;
+import cn.binarywang.wx.miniapp.bean.shop.response.WxMaShopAfterSaleAddResponse;
 import cn.binarywang.wx.miniapp.bean.shop.response.WxMaShopAfterSaleGetResponse;
+import cn.binarywang.wx.miniapp.bean.shop.response.WxMaShopAfterSaleListResponse;
 import cn.binarywang.wx.miniapp.bean.shop.response.WxMaShopBaseResponse;
 import me.chanjar.weixin.common.error.WxErrorException;
 
@@ -21,7 +27,7 @@ public interface WxMaShopAfterSaleService {
    * @return WxMaShopBaseResponse
    * @throws WxErrorException
    */
-  WxMaShopBaseResponse add(WxMaShopAfterSaleAddRequest request) throws WxErrorException;
+  WxMaShopAfterSaleAddResponse add(WxMaShopAfterSaleAddRequest request) throws WxErrorException;
 
   /**
    * 获取订单下售后单
@@ -41,4 +47,81 @@ public interface WxMaShopAfterSaleService {
    */
   WxMaShopBaseResponse update(WxMaShopAfterSaleUpdateRequest request) throws WxErrorException;
 
+  /**
+   * 用户取消售后申请
+   * @param outAfterSaleId 商家自定义订单ID
+   * @param afterSaleId 与out_aftersale_id二选一
+   * @param openId 用户openid
+   * @return
+   * @throws WxErrorException
+   */
+  WxMaShopBaseResponse cancel(String outAfterSaleId, Long afterSaleId, String openId)
+    throws WxErrorException;
+
+  /**
+   * 用户上传退货物流
+   * @param request
+   * @return
+   * @throws WxErrorException
+   */
+  WxMaShopBaseResponse uploadReturnInfo(WxMaShopAfterSaleUploadReturnInfoRequest request)
+    throws WxErrorException;
+
+  /**
+   * 商家同意退款
+   * @param outAfterSaleId
+   * @param afterSaleId
+   * @return
+   * @throws WxErrorException
+   */
+  WxMaShopBaseResponse acceptRefund(String outAfterSaleId, Long afterSaleId)
+    throws WxErrorException;
+
+  /**
+   * 商家同意退货
+   * @param request
+   * @return
+   * @throws WxErrorException
+   */
+  WxMaShopBaseResponse acceptReturn(WxMaShopAcceptReturnRequest request)
+    throws WxErrorException;
+
+  /**
+   * 商家拒绝售后
+   * @param outAfterSaleId
+   * @param afterSaleId
+   * @return
+   * @throws WxErrorException
+   */
+  WxMaShopBaseResponse reject(String outAfterSaleId, Long afterSaleId)
+    throws WxErrorException;
+
+  /**
+   * 商家上传退款凭证
+   * @param request
+   * @return
+   * @throws WxErrorException
+   */
+  WxMaShopBaseResponse uploadCertificates(WxMaShopUploadCerficatesRequest request)
+    throws WxErrorException;
+
+  /**
+   * 商家更新订单售后期
+   * @param outOrderId
+   * @param orderId
+   * @param openid
+   * @param afterSaleDeadline
+   * @return
+   * @throws WxErrorException
+   */
+  WxMaShopBaseResponse updateDeadline(String outOrderId, Long orderId, String openid,
+    Long afterSaleDeadline) throws WxErrorException;
+
+  /**
+   * 获取售后单详情
+   * @param request
+   * @return
+   * @throws WxErrorException
+   */
+  WxMaShopAfterSaleListResponse list(WxMaShopAfterSaleListRequest request) throws WxErrorException;
 }
diff --git a/...miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopAfterSaleServiceImpl.java b/...miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaShopAfterSaleServiceImpl.java
@@ -2,10 +2,16 @@
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.WxMaShopAfterSaleService;
+import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAcceptReturnRequest;
 import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleAddRequest;
 import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleGetRequest;
+import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleListRequest;
 import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleUpdateRequest;
+import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleUploadReturnInfoRequest;
+import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopUploadCerficatesRequest;
+import cn.binarywang.wx.miniapp.bean.shop.response.WxMaShopAfterSaleAddResponse;
 import cn.binarywang.wx.miniapp.bean.shop.response.WxMaShopAfterSaleGetResponse;
+import cn.binarywang.wx.miniapp.bean.shop.response.WxMaShopAfterSaleListResponse;
 import cn.binarywang.wx.miniapp.bean.shop.response.WxMaShopBaseResponse;
 import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
 import com.google.gson.JsonObject;
@@ -14,6 +20,7 @@
 import me.chanjar.weixin.common.enums.WxType;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.common.util.json.GsonParser;
 
 import static cn.binarywang.wx.miniapp.constant.WxMaApiUrlConstants.Shop.Aftersale.*;
@@ -37,13 +44,13 @@ public class WxMaShopAfterSaleServiceImpl implements WxMaShopAfterSaleService {
    * @throws WxErrorException
    */
   @Override
-  public WxMaShopBaseResponse add(WxMaShopAfterSaleAddRequest request) throws WxErrorException {
+  public WxMaShopAfterSaleAddResponse add(WxMaShopAfterSaleAddRequest request) throws WxErrorException {
     String responseContent = this.wxMaService.post(AFTERSALE_ADD, request);
     JsonObject jsonObject = GsonParser.parse(responseContent);
     if (jsonObject.get(ERRCODE).getAsInt() != 0) {
       throw new WxErrorException(WxError.fromJson(responseContent, WxType.MiniApp));
     }
-    return WxMaGsonBuilder.create().fromJson(responseContent, WxMaShopBaseResponse.class);
+    return WxMaGsonBuilder.create().fromJson(responseContent, WxMaShopAfterSaleAddResponse.class);
   }
 
   /**
@@ -79,4 +86,154 @@ public WxMaShopBaseResponse update(WxMaShopAfterSaleUpdateRequest request) throw
     }
     return WxMaGsonBuilder.create().fromJson(responseContent, WxMaShopBaseResponse.class);
   }
+
+  /**
+   * 用户取消售后申请
+   * @param outAfterSaleId 商家自定义订单ID
+   * @param afterSaleId 与out_aftersale_id二选一
+   * @param openId 用户openid
+   * @return
+   * @throws WxErrorException
+   */
+  @Override
+  public WxMaShopBaseResponse cancel(String outAfterSaleId, Long afterSaleId, String openId)
+    throws WxErrorException {
+    JsonObject request = GsonHelper.buildJsonObject("out_aftersale_id", outAfterSaleId,
+      "aftersale_id", afterSaleId, "openid", openId);
+    String resp = this.wxMaService.post(AFTERSALE_CANCEL, request);
+    JsonObject jsonObject = GsonParser.parse(resp);
+    if (jsonObject.get(ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(resp, WxType.MiniApp));
+    }
+    return WxMaGsonBuilder.create().fromJson(resp, WxMaShopBaseResponse.class);
+  }
+
+  /**
+   * 用户上传退货物流
+   * @param request
+   * @return
+   * @throws WxErrorException
+   */
+  @Override
+  public WxMaShopBaseResponse uploadReturnInfo(WxMaShopAfterSaleUploadReturnInfoRequest request)
+    throws WxErrorException {
+    String resp = this.wxMaService.post(AFTERSALE_UPLOAD_RETURN_INFO, request);
+    JsonObject jsonObject = GsonParser.parse(resp);
+    if (jsonObject.get(ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(resp, WxType.MiniApp));
+    }
+    return WxMaGsonBuilder.create().fromJson(resp, WxMaShopBaseResponse.class);
+  }
+
+  /**
+   * 商家同意退款
+   * @param outAfterSaleId
+   * @param afterSaleId
+   * @return
+   * @throws WxErrorException
+   */
+  @Override
+  public WxMaShopBaseResponse acceptRefund(String outAfterSaleId, Long afterSaleId)
+    throws WxErrorException {
+    JsonObject request = GsonHelper.buildJsonObject("out_aftersale_id", outAfterSaleId,
+      "aftersale_id", afterSaleId);
+    String resp = this.wxMaService.post(AFTERSALE_ACCEPT_REFUND, request);
+    JsonObject jsonObject = GsonParser.parse(resp);
+    if (jsonObject.get(ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(resp, WxType.MiniApp));
+    }
+    return WxMaGsonBuilder.create().fromJson(resp, WxMaShopBaseResponse.class);
+  }
+
+  /**
+   * 商家同意退货
+   * @param request
+   * @return
+   * @throws WxErrorException
+   */
+  @Override
+  public WxMaShopBaseResponse acceptReturn(WxMaShopAcceptReturnRequest request)
+    throws WxErrorException {
+    String resp = this.wxMaService.post(AFTERSALE_ACCEPT_RETURN, request);
+    JsonObject jsonObject = GsonParser.parse(resp);
+    if (jsonObject.get(ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(resp, WxType.MiniApp));
+    }
+    return WxMaGsonBuilder.create().fromJson(resp, WxMaShopBaseResponse.class);
+  }
+
+  /**
+   * 商家拒绝售后
+   * @param outAfterSaleId
+   * @param afterSaleId
+   * @return
+   * @throws WxErrorException
+   */
+  @Override
+  public WxMaShopBaseResponse reject(String outAfterSaleId, Long afterSaleId)
+    throws WxErrorException {
+    JsonObject request = GsonHelper.buildJsonObject("out_aftersale_id", outAfterSaleId,
+      "aftersale_id", afterSaleId);
+    String resp = this.wxMaService.post(AFTERSALE_REJECT, request);
+    JsonObject jsonObject = GsonParser.parse(resp);
+    if (jsonObject.get(ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(resp, WxType.MiniApp));
+    }
+    return WxMaGsonBuilder.create().fromJson(resp, WxMaShopBaseResponse.class);
+  }
+
+  /**
+   * 商家上传退款凭证
+   * @param request
+   * @return
+   * @throws WxErrorException
+   */
+  @Override
+  public WxMaShopBaseResponse uploadCertificates(WxMaShopUploadCerficatesRequest request)
+    throws WxErrorException {
+    String resp = this.wxMaService.post(AFTERSALE_UPLOAD_CERTIFICATES, request);
+    JsonObject jsonObject = GsonParser.parse(resp);
+    if (jsonObject.get(ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(resp, WxType.MiniApp));
+    }
+    return WxMaGsonBuilder.create().fromJson(resp, WxMaShopBaseResponse.class);
+  }
+
+  /**
+   * 商家更新订单售后期
+   * @param outOrderId
+   * @param orderId
+   * @param openid
+   * @param afterSaleDeadline
+   * @return
+   * @throws WxErrorException
+   */
+  @Override
+  public WxMaShopBaseResponse updateDeadline(String outOrderId, Long orderId, String openid,
+    Long afterSaleDeadline) throws WxErrorException {
+    JsonObject request = GsonHelper.buildJsonObject("out_order_id", outOrderId,
+      "order_id", orderId, "openid", openid, "after_sale_deadline", afterSaleDeadline);
+    String resp = this.wxMaService.post(AFTERSALE_UPLOAD_DEADLINE, request);
+    JsonObject jsonObject = GsonParser.parse(resp);
+    if (jsonObject.get(ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(resp, WxType.MiniApp));
+    }
+    return WxMaGsonBuilder.create().fromJson(resp, WxMaShopBaseResponse.class);
+  }
+
+  /**
+   * 获取售后单详情
+   * @param request
+   * @return
+   * @throws WxErrorException
+   */
+  @Override
+  public WxMaShopAfterSaleListResponse list(WxMaShopAfterSaleListRequest request) throws WxErrorException {
+    String resp = this.wxMaService.post(AFTERSALE_GET_LIST, request);
+    JsonObject jsonObject = GsonParser.parse(resp);
+    if (jsonObject.get(ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(resp, WxType.MiniApp));
+    }
+    return WxMaGsonBuilder.create().fromJson(resp, WxMaShopAfterSaleListResponse.class);
+  }
 }
diff --git a/...src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAcceptReturnRequest.java b/...src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAcceptReturnRequest.java
@@ -0,0 +1,43 @@
+package cn.binarywang.wx.miniapp.bean.shop.request;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author leiin
+ * @date 2022/6/28 11:39 上午
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WxMaShopAcceptReturnRequest implements Serializable {
+  @SerializedName("out_aftersale_id")
+  private String outAftersaleId;
+  @SerializedName("aftersale_id")
+  private Long aftersaleId;
+  @SerializedName("address_info")
+  private RefundAddressInfo addressInfo;
+
+  @Data
+  public static class RefundAddressInfo {
+    @SerializedName("receiver_name")
+    private String receiverName;
+    @SerializedName("detailed_address")
+    private String detailedAddress;
+    @SerializedName("tel_number")
+    private String telNumber;
+    @SerializedName("country")
+    private String country;
+    @SerializedName("province")
+    private String province;
+    @SerializedName("city")
+    private String city;
+    @SerializedName("town")
+    private String town;
+  }
+}
diff --git a/...src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleAddRequest.java b/...src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopAfterSaleAddRequest.java
@@ -33,6 +33,8 @@ public class WxMaShopAfterSaleAddRequest implements Serializable {
    * product_infos : [{"out_product_id":"234245","out_sku_id":"23424","product_cnt":5}]
    */
 
+  @SerializedName("order_id")
+  private Long orderId;
   @SerializedName("out_order_id")
   private String outOrderId;
   @SerializedName("out_aftersale_id")
@@ -41,8 +43,14 @@ public class WxMaShopAfterSaleAddRequest implements Serializable {
   private String openid;
   @SerializedName("type")
   private Integer type;
-  @SerializedName("create_time")
-  private String createTime;
+  @SerializedName("product_info")
+  private List<ProductInfosBean> productInfos;
+  @SerializedName("orderamt")
+  private Long orderamt;
+  @SerializedName("refund_reason")
+  private String refundReason;
+  @SerializedName("refund_reason_type")
+  private Integer refundReasonType;
   @SerializedName("status")
   private Integer status;
   @SerializedName("finish_all_aftersale")
@@ -51,8 +59,8 @@ public class WxMaShopAfterSaleAddRequest implements Serializable {
   private String path;
   @SerializedName("refund")
   private Long refund;
-  @SerializedName("product_infos")
-  private List<ProductInfosBean> productInfos;
+  @SerializedName("media_list")
+  private UploadMediaList mediaList;
 
   @Data
   @Builder
@@ -72,4 +80,12 @@ public static class ProductInfosBean implements Serializable {
     @SerializedName("product_cnt")
     private Integer productCnt;
   }
+
+  @Data
+  public static class UploadMediaList {
+    private Integer type;
+    private String url;
+    @SerializedName("thumb_url")
+    private String thumbUrl;
+  }
 }