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 0000000000000000000000000000000000000000..a6558beaeb26d0a1bdb152612a8281a5169b0654
--- /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/WxMaExpressInfoResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressInfoResult.java
new file mode 100644
index 0000000000000000000000000000000000000000..9819c10d013efad73173148a53d85828da80dbfb
--- /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 9502eee82654ecf8891d63707492bf587a0a38b9..275c2d093b61be365498f8d7245ad41528fc9cd5 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
new file mode 100644
index 0000000000000000000000000000000000000000..e97c03b6de26d4b755eee488be56d2069168c73b
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressReturnInfoResult.java
@@ -0,0 +1,68 @@
+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 extends WxMaExpressInfoResult implements Serializable {
+
+ private static final long serialVersionUID = -9166603059965942285L;
+
+ /**
+ * 退货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 23ea773880a6116dc81ad2832e49975fbda31f8c..e51879d8ed4d536fbd4a32d5494657bf461bdccc 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 5f3d19c02faffb640626f49a251ddbbb749a965d..26eec1fa66c4d1a556290e12f9237d43e0ae0ed7 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);