From 4bbb8cc5d139e80d1bac1721acbe9a51f010c8f1 Mon Sep 17 00:00:00 2001 From: cder <13673609502@139.com> Date: Thu, 7 Sep 2023 18:14:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=A2=9E=E5=8A=A0=E9=80=80=E8=B4=A7=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/WxMaExpressDeliveryReturnService.java | 22 +++++ .../wx/miniapp/api/WxMaMediaService.java | 2 +- .../wx/miniapp/api/WxMaOpenApiService.java | 4 +- .../wx/miniapp/api/WxMaService.java | 1 + .../miniapp/api/impl/BaseWxMaServiceImpl.java | 6 ++ .../WxMaExpressDeliveryReturnServiceImpl.java | 36 +++++++ .../WxMaImmediateDeliveryServiceImpl.java | 12 +-- .../WxMaExpressDeliveryReturnAddRequest.java | 93 +++++++++++++++++++ .../request/WxMaExpressReturnOrder.java | 40 ++++++++ .../result/WxMaExpressReturnInfoResult.java | 77 +++++++++++++++ .../miniapp/constant/WxMaApiUrlConstants.java | 14 +++ .../wx/miniapp/test/ApiTestModule.java | 2 +- 12 files changed, 299 insertions(+), 10 deletions(-) create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaExpressDeliveryReturnService.java create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressDeliveryReturnServiceImpl.java create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressDeliveryReturnAddRequest.java create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressReturnOrder.java create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressReturnInfoResult.java diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaExpressDeliveryReturnService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaExpressDeliveryReturnService.java new file mode 100644 index 000000000..4254d18df --- /dev/null +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaExpressDeliveryReturnService.java @@ -0,0 +1,22 @@ +package cn.binarywang.wx.miniapp.api; + +import cn.binarywang.wx.miniapp.bean.express.request.WxMaExpressDeliveryReturnAddRequest; +import cn.binarywang.wx.miniapp.bean.express.result.WxMaExpressReturnInfoResult; +import me.chanjar.weixin.common.error.WxErrorException; + +/** + * 退货组件 + */ +public interface WxMaExpressDeliveryReturnService { + + /** + * 获取支持的快递公司列表 + */ + String ADD_DELIVERY_RETURN_URL = "https://api.weixin.qq.com/cgi-bin/express/delivery/return/add"; + String GET_DELIVERY_RETURN_URL = "https://api.weixin.qq.com/cgi-bin/express/delivery/return/get"; + String UNBIND_DELIVERY_RETURN_URL = "https://api.weixin.qq.com/cgi-bin/express/delivery/return/unbind"; + + WxMaExpressReturnInfoResult addDeliveryReturn(WxMaExpressDeliveryReturnAddRequest wxMaExpressDeliveryReturnAddRequest) throws WxErrorException; + WxMaExpressReturnInfoResult getDeliveryReturn(String returnId) throws WxErrorException; + WxMaExpressReturnInfoResult unbindDeliveryReturn(String returnId) throws WxErrorException; +} diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMediaService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMediaService.java index 9cf42599a..519c5ef87 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMediaService.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMediaService.java @@ -46,7 +46,7 @@ public interface WxMaMediaService { * @param inputStream 输入流 * @return the wx media upload result * @throws WxErrorException the wx error exception - * @see #uploadMedia(java.lang.String, java.io.File) #uploadMedia(java.lang.String, java.io.File) + * @see #uploadMedia(String, File) #uploadMedia(java.lang.String, java.io.File) */ WxMediaUploadResult uploadMedia(String mediaType, String fileType, InputStream inputStream) throws WxErrorException; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaOpenApiService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaOpenApiService.java index 301884362..438c43c6b 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaOpenApiService.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaOpenApiService.java @@ -19,7 +19,7 @@ public interface WxMaOpenApiService { * * @return 是否成功 * @throws WxErrorException the wx error exception - * @apiNote !!! 单小程序直接调用该方法 , 如多个appid调用此方法前请调用 {@link cn.binarywang.wx.miniapp.api.WxMaService#switchoverTo} 切换appid !!! + * @apiNote !!! 单小程序直接调用该方法 , 如多个appid调用此方法前请调用 {@link WxMaService#switchoverTo} 切换appid !!! * @code wxMaService.getWxMaOpenApiService().clearQuota() //单个 * @code wxMaService.switchoverTo(" appid ").getWxMaOpenApiService().clearQuota() //多个 * @see 注意事项参考微信文档 @@ -55,7 +55,7 @@ public interface WxMaOpenApiService { * * @return 是否成功 * @throws WxErrorException 微信异常 - * @apiNote !!! 单小程序直接调用该方法 , 如多个appid调用此方法前请调用 {@link cn.binarywang.wx.miniapp.api.WxMaService#switchoverTo} 切换appid!!! + * @apiNote !!! 单小程序直接调用该方法 , 如多个appid调用此方法前请调用 {@link WxMaService#switchoverTo} 切换appid!!! * 参考示例 * @code wxMaService.getWxMaOpenApiService().clearQuotaByAppSecret() //单个 * @code wxMaService.switchoverTo(" appid ").getWxMaOpenApiService().clearQuotaByAppSecret() //多个 diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java index 0e4b6eb9a..4dc51f748 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java @@ -554,4 +554,5 @@ public interface WxMaService extends WxService { * @return getWxMaXPayService */ WxMaXPayService getWxMaXPayService(); + WxMaExpressDeliveryReturnService getWxMaExpressDeliveryReturnService(); } diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java index fee8cfea9..777785bac 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java @@ -91,6 +91,7 @@ public abstract class BaseWxMaServiceImpl implements WxMaService, RequestH private final WxMaOpenApiService wxMaOpenApiService = new WxMaOpenApiServiceImpl(this); private final WxMaVodService wxMaVodService = new WxMaVodServiceImpl(this); private final WxMaXPayService wxMaXPayService = new WxMaXPayServiceImpl(this); + private final WxMaExpressDeliveryReturnService wxMaExpressDeliveryReturnService = new WxMaExpressDeliveryReturnServiceImpl(this); private Map configMap = new HashMap<>(); private int retrySleepMillis = 1000; @@ -674,4 +675,9 @@ public abstract class BaseWxMaServiceImpl implements WxMaService, RequestH public WxMaXPayService getWxMaXPayService() { return this.wxMaXPayService; } + + @Override + public WxMaExpressDeliveryReturnService getWxMaExpressDeliveryReturnService(){ + return this.wxMaExpressDeliveryReturnService; + } } diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressDeliveryReturnServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressDeliveryReturnServiceImpl.java new file mode 100644 index 000000000..aef8a2cad --- /dev/null +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressDeliveryReturnServiceImpl.java @@ -0,0 +1,36 @@ +package cn.binarywang.wx.miniapp.api.impl; + +import cn.binarywang.wx.miniapp.api.WxMaExpressDeliveryReturnService; +import cn.binarywang.wx.miniapp.api.WxMaService; +import cn.binarywang.wx.miniapp.bean.express.request.WxMaExpressDeliveryReturnAddRequest; +import cn.binarywang.wx.miniapp.bean.express.result.WxMaExpressReturnInfoResult; +import com.google.gson.JsonObject; +import lombok.RequiredArgsConstructor; +import me.chanjar.weixin.common.error.WxErrorException; + +@RequiredArgsConstructor +public class WxMaExpressDeliveryReturnServiceImpl implements WxMaExpressDeliveryReturnService { + private final WxMaService service; + + @Override + public WxMaExpressReturnInfoResult addDeliveryReturn(WxMaExpressDeliveryReturnAddRequest wxMaExpressDeliveryReturnAddRequest) throws WxErrorException { + String result= this.service.get(ADD_DELIVERY_RETURN_URL,wxMaExpressDeliveryReturnAddRequest.toJson()); + return WxMaExpressReturnInfoResult.fromJson(result); + } + + @Override + public WxMaExpressReturnInfoResult getDeliveryReturn(String returnId) throws WxErrorException { + JsonObject param = new JsonObject(); + param.addProperty("return_id",returnId); + String result= this.service.get(GET_DELIVERY_RETURN_URL,param.toString()); + return WxMaExpressReturnInfoResult.fromJson(result); + } + + @Override + public WxMaExpressReturnInfoResult unbindDeliveryReturn(String returnId) throws WxErrorException { + JsonObject param = new JsonObject(); + param.addProperty("return_id",returnId); + String result= this.service.get(UNBIND_DELIVERY_RETURN_URL,param.toString()); + return WxMaExpressReturnInfoResult.fromJson(result); + } +} diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaImmediateDeliveryServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaImmediateDeliveryServiceImpl.java index e0843c47c..b6c3814f6 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaImmediateDeliveryServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaImmediateDeliveryServiceImpl.java @@ -59,7 +59,7 @@ public class WxMaImmediateDeliveryServiceImpl implements WxMaImmediateDeliverySe */ @Override public BindAccountResponse getBindAccount() throws WxErrorException { - return this.parse(this.wxMaService.post(WxMaApiUrlConstants.InstantDelivery.GET_BIND_ACCOUNT, "{}"), + return this.parse(this.wxMaService.post(InstantDelivery.GET_BIND_ACCOUNT, "{}"), BindAccountResponse.class); } @@ -76,7 +76,7 @@ public class WxMaImmediateDeliveryServiceImpl implements WxMaImmediateDeliverySe @Override public AddOrderResponse addOrder(final AddOrderRequest request) throws WxErrorException { request.getDeliverySign(); - return this.parse(this.wxMaService.post(WxMaApiUrlConstants.InstantDelivery.PlaceAnOrder.ADD_ORDER, request), + return this.parse(this.wxMaService.post(InstantDelivery.PlaceAnOrder.ADD_ORDER, request), AddOrderResponse.class); } @@ -94,7 +94,7 @@ public class WxMaImmediateDeliveryServiceImpl implements WxMaImmediateDeliverySe @Override public GetOrderResponse getOrder(final GetOrderRequest request) throws WxErrorException { request.getDeliverySign(); - return this.parse(this.wxMaService.post(WxMaApiUrlConstants.InstantDelivery.GET_ORDER, request), + return this.parse(this.wxMaService.post(InstantDelivery.GET_ORDER, request), GetOrderResponse.class); } @@ -111,7 +111,7 @@ public class WxMaImmediateDeliveryServiceImpl implements WxMaImmediateDeliverySe @Override public CancelOrderResponse cancelOrder(final CancelOrderRequest request) throws WxErrorException { request.getDeliverySign(); - return this.parse(this.wxMaService.post(WxMaApiUrlConstants.InstantDelivery.Cancel.CANCEL_ORDER, request), + return this.parse(this.wxMaService.post(InstantDelivery.Cancel.CANCEL_ORDER, request), CancelOrderResponse.class); } @@ -128,7 +128,7 @@ public class WxMaImmediateDeliveryServiceImpl implements WxMaImmediateDeliverySe @Override public AbnormalConfirmResponse abnormalConfirm(final AbnormalConfirmRequest request) throws WxErrorException { request.getDeliverySign(); - return this.parse(this.wxMaService.post(WxMaApiUrlConstants.InstantDelivery.Cancel.ABNORMAL_CONFIRM, request), + return this.parse(this.wxMaService.post(InstantDelivery.Cancel.ABNORMAL_CONFIRM, request), AbnormalConfirmResponse.class); } @@ -144,7 +144,7 @@ public class WxMaImmediateDeliveryServiceImpl implements WxMaImmediateDeliverySe */ @Override public MockUpdateOrderResponse mockUpdateOrder(final MockUpdateOrderRequest request) throws WxErrorException { - return this.parse(this.wxMaService.post(WxMaApiUrlConstants.InstantDelivery.MOCK_UPDATE_ORDER, request), + return this.parse(this.wxMaService.post(InstantDelivery.MOCK_UPDATE_ORDER, request), MockUpdateOrderResponse.class); } diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressDeliveryReturnAddRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressDeliveryReturnAddRequest.java new file mode 100644 index 000000000..9b5caa0be --- /dev/null +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressDeliveryReturnAddRequest.java @@ -0,0 +1,93 @@ +package cn.binarywang.wx.miniapp.bean.express.request; + +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; +import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * 创建退货ID + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class WxMaExpressDeliveryReturnAddRequest implements Serializable { + private static final long serialVersionUID = -9111430627246688840L; + + /** + * 商家内部使用的退货编号 + * 
+   * 是否必填： 是
+   * 描述：
+   *
+ */ + @SerializedName("shop_order_id") + private String shopOrderId; + + /** + * 商家退货地址 + * 
+   * 是否必填： 是
+   *
+ */ + @SerializedName("biz_addr") + private WxMaExpressOrderPerson bizAddr; + + /** + * 用户购物时的收货地址 + * 
+   * 是否必填： 否
+   *
+ */ + @SerializedName("user_addr") + private WxMaExpressOrderPerson userAddr; + + /** + * 退货用户的openid + * 
+   * 是否必填： 是
+   *
+ */ + @SerializedName("openid") + private String openid; + + + /** + * 退货订单在小程序中的path + * 
+   * 是否必填： 是
+   *
+ */ + @SerializedName("order_path") + private String orderPath; + + /** + * 退货订单的金额（单位：分） + * 
+   * 是否必填：是
+   *
+ */ + @SerializedName("goods_list") + private List goodsList; + + + /** + * 退货订单的金额（单位：分） + * 
+   * 是否必填：是
+   *
+ */ + @SerializedName("order_price") + private Integer orderPrice; + + + + public String toJson() { + return WxMaGsonBuilder.create().toJson(this); + } + +} diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressReturnOrder.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressReturnOrder.java new file mode 100644 index 000000000..a6558beae --- /dev/null +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressReturnOrder.java @@ -0,0 +1,40 @@ +package cn.binarywang.wx.miniapp.bean.express.request; + +import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 退货商品对象 + * @author xiaoyu + * @since 2019-11-26 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class WxMaExpressReturnOrder implements Serializable { + private static final long serialVersionUID = -7798434835843377474L; + + /** + * 商品名称 + * 
+   * 是否必填： 是
+   *
+ */ + @SerializedName("name") + private String name; + + /** + * 商品缩略图url + * 
+   * 是否必填： 是
+   *
+ */ + @SerializedName("url") + private String url; + + +} diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressReturnInfoResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressReturnInfoResult.java new file mode 100644 index 000000000..65cd8efa6 --- /dev/null +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressReturnInfoResult.java @@ -0,0 +1,77 @@ +package cn.binarywang.wx.miniapp.bean.express.result; + +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; +import com.google.gson.annotations.SerializedName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 
+ * 运单信息返回结果对象
+ *
+ * @author xiaoyu + * @since 2019-11-26 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class WxMaExpressReturnInfoResult implements Serializable { + + private static final long serialVersionUID = -9166603059965942285L; + + /** + * 错误码 + */ + private Integer errcode; + + /** + * 错误信息 + */ + private String errmsg; + /** + * 退货ID + */ + @SerializedName("return_id") + private String returnId; + + + /** + * 0 用户未填写退货信息, 1. 在线预约, 2. 自主填写 + */ + private String status; + + + /** + * 运单ID + */ + @SerializedName("waybill_id") + private String waybillId; + + /** + * //0› 已下单待揽件 1› 已揽件 2› 运输中 3› 派件中 4› 已签收 5› 异常 6› 代签收 7› 揽收失败 8› 签收失败（拒收，超区） 11› 已取消 13› 退件中 14› 已退件 99 未知 + */ + @SerializedName("order_status") + private String orderStatus; + + /** + * //运力公司名称 + */ + @SerializedName("delivery_name") + private String deliveryName; + + /** + * //运力公司名称 + */ + @SerializedName("delivery_id") + private String deliveryId; + + + + public static WxMaExpressReturnInfoResult fromJson(String json) { + return WxMaGsonBuilder.create().fromJson(json, WxMaExpressReturnInfoResult.class); + } + +} diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/WxMaApiUrlConstants.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/WxMaApiUrlConstants.java index 23ea77388..e51879d8e 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/WxMaApiUrlConstants.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/WxMaApiUrlConstants.java @@ -872,4 +872,18 @@ public class WxMaApiUrlConstants { String QUERY_PUBLISH_GOODS_URL = "https://api.weixin.qq.com/xpay/query_publish_goods?pay_sig=%s"; } + + /** + * 退货组件 + * 
+   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_sale_return.html
+   *
+ * + */ + public interface ExpressDeliveryReturn{ + String ADD_DELIVERY_RETURN_URL = "https://api.weixin.qq.com/cgi-bin/express/delivery/return/add"; + String GET_DELIVERY_RETURN_URL = "https://api.weixin.qq.com/cgi-bin/express/delivery/return/get"; + String UNBIND_DELIVERY_RETURN_URL = "https://api.weixin.qq.com/cgi-bin/express/delivery/return/unbind"; + } + } diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/test/ApiTestModule.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/test/ApiTestModule.java index 5f3d19c02..26eec1fa6 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/test/ApiTestModule.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/test/ApiTestModule.java @@ -35,7 +35,7 @@ public class ApiTestModule implements Module { binder.bind(WxMaService.class).toInstance(wxService); binder.bind(WxMaConfig.class).toInstance(config); - WxMaServiceOkHttpImpl wxMaServiceOkHttp = new cn.binarywang.wx.miniapp.api.impl.WxMaServiceOkHttpImpl(); + WxMaServiceOkHttpImpl wxMaServiceOkHttp = new WxMaServiceOkHttpImpl(); wxMaServiceOkHttp.setWxMaConfig(config); binder.bind(WxMaServiceOkHttpImpl.class).toInstance(wxMaServiceOkHttp); -- Gitee From 2c08db541dd570cd1df27aac61d2e4082e33a1f1 Mon Sep 17 00:00:00 2001 From: cder <13673609502@139.com> Date: Thu, 14 Sep 2023 12:00:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=EF=BC=8C=E7=BB=91=E5=AE=9A/=E8=A7=A3=E7=BB=91?= =?UTF-8?q?=E7=89=A9=E6=B5=81=E8=B4=A6=E5=8F=B7=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=80=BC=E3=80=82=20https:?= =?UTF-8?q?//developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/express/e?= =?UTF-8?q?xpress-by-business/bindAccount.html?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wx/miniapp/api/WxMaExpressService.java | 3 ++- .../api/impl/WxMaExpressServiceImpl.java | 5 +++-- .../express/result/WxMaExpressInfoResult.java | 19 +++++++++++++++++++ .../result/WxMaExpressOrderInfoResult.java | 11 +---------- .../result/WxMaExpressReturnInfoResult.java | 11 +---------- 5 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressInfoResult.java diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaExpressService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaExpressService.java index cbac84c74..72575db1d 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaExpressService.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaExpressService.java @@ -5,6 +5,7 @@ import cn.binarywang.wx.miniapp.bean.express.WxMaExpressDelivery; import cn.binarywang.wx.miniapp.bean.express.WxMaExpressPath; import cn.binarywang.wx.miniapp.bean.express.WxMaExpressPrinter; import cn.binarywang.wx.miniapp.bean.express.request.*; +import cn.binarywang.wx.miniapp.bean.express.result.WxMaExpressInfoResult; import cn.binarywang.wx.miniapp.bean.express.result.WxMaExpressOrderInfoResult; import me.chanjar.weixin.common.error.WxErrorException; @@ -44,7 +45,7 @@ public interface WxMaExpressService { * @param wxMaExpressBindAccountRequest 物流账号对象 * @throws WxErrorException 请求失败时返回 */ - void bindAccount(WxMaExpressBindAccountRequest wxMaExpressBindAccountRequest) throws WxErrorException; + WxMaExpressInfoResult bindAccount(WxMaExpressBindAccountRequest wxMaExpressBindAccountRequest) throws WxErrorException; /** * 获取电子面单余额。仅在使用加盟类快递公司时，才可以调用。 diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImpl.java index 17568c9e8..cc5f8b3cf 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaExpressServiceImpl.java @@ -7,6 +7,7 @@ import cn.binarywang.wx.miniapp.bean.express.WxMaExpressDelivery; import cn.binarywang.wx.miniapp.bean.express.WxMaExpressPath; import cn.binarywang.wx.miniapp.bean.express.WxMaExpressPrinter; import cn.binarywang.wx.miniapp.bean.express.request.*; +import cn.binarywang.wx.miniapp.bean.express.result.WxMaExpressInfoResult; import cn.binarywang.wx.miniapp.bean.express.result.WxMaExpressOrderInfoResult; import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; import lombok.RequiredArgsConstructor; @@ -39,8 +40,8 @@ public class WxMaExpressServiceImpl implements WxMaExpressService { } @Override - public void bindAccount(WxMaExpressBindAccountRequest wxMaExpressBindAccountRequest) throws WxErrorException { - this.service.post(BIND_ACCOUNT_URL, wxMaExpressBindAccountRequest.toJson()); + public WxMaExpressInfoResult bindAccount(WxMaExpressBindAccountRequest wxMaExpressBindAccountRequest) throws WxErrorException { + return WxMaExpressInfoxResult.fromJson(this.service.post(BIND_ACCOUNT_URL, wxMaExpressBindAccountRequest.toJson())); } @Override diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressInfoResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressInfoResult.java new file mode 100644 index 000000000..9819c10d0 --- /dev/null +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressInfoResult.java @@ -0,0 +1,19 @@ +package cn.binarywang.wx.miniapp.bean.express.result; + +import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder; + +public class WxMaExpressInfoResult { + /** + * 错误码 + */ + private Integer errcode; + + /** + * 错误信息 + */ + private String errmsg; + + public static WxMaExpressInfoResult fromJson(String json) { + return WxMaGsonBuilder.create().fromJson(json, WxMaExpressInfoResult.class); + } +} diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java index 9502eee82..275c2d093 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java @@ -23,19 +23,10 @@ import java.util.Map; @Data @NoArgsConstructor @AllArgsConstructor -public class WxMaExpressOrderInfoResult implements Serializable { +public class WxMaExpressOrderInfoResult extends WxMaExpressInfoResult implements Serializable { private static final long serialVersionUID = -9166603059965942285L; - /** - * 错误码 - */ - private Integer errcode; - - /** - * 错误信息 - */ - private String errmsg; /** * 订单ID */ diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressReturnInfoResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressReturnInfoResult.java index 65cd8efa6..e97c03b6d 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressReturnInfoResult.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressReturnInfoResult.java @@ -18,19 +18,10 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor -public class WxMaExpressReturnInfoResult implements Serializable { +public class WxMaExpressReturnInfoResult extends WxMaExpressInfoResult implements Serializable { private static final long serialVersionUID = -9166603059965942285L; - /** - * 错误码 - */ - private Integer errcode; - - /** - * 错误信息 - */ - private String errmsg; /** * 退货ID */ -- Gitee