🎨 #2715【企业微信&小程序】微信客服、小程序物流服务和交易组件 等相关接口优化更新

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/delivery/FollowWaybillRequest.java

@@ -0,0 +1,103 @@
+package cn.binarywang.wx.miniapp.bean.delivery;
+
+
+import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * <pre>
+ * 传运单接口 follow_waybil
+ *
+ * 商户使用此接口向微信提供某交易单号对应的运单号。微信后台会跟踪运单的状态变化，在关键物流节点给下单用户推送消息通知。
+ * </pre>
+ *
+ * @author boris
+ * @since 2022-04-01
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class FollowWaybillRequest implements Serializable {
+
+  private static final long serialVersionUID = -7538739003766268386L;
+
+
+  /**
+   * 用户openid
+   * <pre>
+   * 是否必填： 是
+   * 描述： 用户openid
+   * </pre>
+   */
+  @SerializedName("openid")
+  private String openid;
+
+  /**
+   * 寄件人手机号
+   * <pre>
+   * 是否必填： 否
+   * 描述：
+   * </pre>
+   */
+  @SerializedName("sender_phone")
+  private String senderPhone;
+
+  /**
+   * 收件人手机号
+   * <pre>
+   * 是否必填： 否
+   * 描述：部分运力需要用户手机号作为查单依据
+   * </pre>
+   */
+  @SerializedName("receiver_phone")
+  private String receiverPhone;
+
+  /**
+   * 运单ID
+   * <pre>
+   * 是否必填： 是
+   * </pre>
+   */
+  @SerializedName("waybill_id")
+  private String waybillId;
+
+  /**
+   * 交易单号（微信支付生成的交易单号，一般以420开头）
+   * <pre>
+   * 是否必填： 是
+   * </pre>
+   */
+  @SerializedName("trans_id")
+  private String transId;
+
+
+  /**
+   * 点击落地页商品卡片跳转路径（建议为订单详情页path），不传默认跳转小程序首页。
+   * <pre>
+   * 是否必填： 否
+   * </pre>
+   */
+  @SerializedName("order_detail_path")
+  private String orderDetailPath;
+
+  /**
+   * 商品信息
+   * <pre>
+   * 是否必填： 是
+   * </pre>
+   */
+  @SerializedName("goods_info")
+  private WaybillGoodsInfo goodsInfo;
+
+  public String toJson() {
+    return WxMaGsonBuilder.create().toJson(this);
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/delivery/FollowWaybillResponse.java

@@ -0,0 +1,34 @@
+package cn.binarywang.wx.miniapp.bean.delivery;
+
+import cn.binarywang.wx.miniapp.bean.WxMaBaseResponse;
+import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <pre>
+ * 查运单接口 query_follow_trace 响应参数
+ * </pre>
+ *
+ * @author boris
+ * @since 2022-04-01
+ */
+@Data
+@Accessors(chain = true)
+public class FollowWaybillResponse extends WxMaBaseResponse implements Serializable {
+
+  private static final long serialVersionUID = 3773007367000633663L;
+
+  /**
+   * 查询id.
+   */
+  @SerializedName("waybill_token")
+  private String waybillToken;
+
+
+  public static FollowWaybillResponse fromJson(String json) {
+    return WxMaGsonBuilder.create().fromJson(json, FollowWaybillResponse.class);
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/delivery/QueryFollowTraceRequest.java

@@ -0,0 +1,46 @@
+package cn.binarywang.wx.miniapp.bean.delivery;
+
+
+import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * <pre>
+ * 消息组件-查运单接口 query_follow_trace
+ *
+ * 商户在调用完trace_waybill接口后，可以使用本接口查询到对应运单的详情信息
+ * </pre>
+ *
+ * @author boris
+ * @since 2022-04-01
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class QueryFollowTraceRequest implements Serializable {
+
+  private static final long serialVersionUID = -7538739003766268386L;
+
+
+  /**
+   * 查询id
+   * <pre>
+   * 是否必填： 是
+   * 描述： 可以从 传运单接口 follow_waybill 取数据
+   * </pre>
+   */
+  @SerializedName("waybill_token")
+  private String waybillToken;
+
+  public String toJson() {
+    return WxMaGsonBuilder.create().toJson(this);
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/delivery/QueryFollowTraceResponse.java

@@ -0,0 +1,123 @@
+package cn.binarywang.wx.miniapp.bean.delivery;
+
+import cn.binarywang.wx.miniapp.bean.WxMaBaseResponse;
+import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <pre>
+ * 消息组件-查运单接口 query_follow_trace 响应参数
+ *
+ * 商户在调用完follow_waybill/trace_waybill接口后，可以使用本接口查询到对应运单的详情信息
+ * </pre>
+ *
+ * @author boris
+ * @since 2022-04-01
+ */
+@Data
+@Accessors(chain = true)
+public class QueryFollowTraceResponse extends WxMaBaseResponse implements Serializable {
+
+  private static final long serialVersionUID = 3773007367000633663L;
+
+  /**
+   * 运单信息.
+   */
+  @SerializedName("waybill_info")
+  private WaybillInfo waybillInfo;
+
+  /**
+   * 商品信息
+   */
+  @SerializedName("shop_info")
+  private ShopInfo shopInfo;
+
+  /**
+   * 运力信息.
+   */
+  @SerializedName("delivery_info")
+  private DeliveryInfo deliveryInfo;
+
+
+  public static QueryFollowTraceResponse fromJson(String json) {
+    return WxMaGsonBuilder.create().fromJson(json, QueryFollowTraceResponse.class);
+  }
+
+  /**
+   * 运单信息.
+   */
+  @Data
+  @Accessors(chain = true)
+  public static class WaybillInfo implements Serializable {
+
+    private static final long serialVersionUID = -3759074878713856529L;
+
+    /**
+     * 运单状态	释义
+     * <pre>
+     *
+     * 0	运单不存在或者未揽收
+     * 1	已揽件
+     * 2	运输中
+     * 3	派件中
+     * 4	已签收
+     * 5	异常
+     * 6	代签收
+     *
+     * </pre>
+     */
+    @SerializedName("status")
+    private Integer status;
+
+    /**
+     * 查询id.
+     */
+    @SerializedName("waybill_token")
+    private String waybillToken;
+  }
+
+  /**
+   * 商品信息.
+   */
+  @Data
+  @Accessors(chain = true)
+  public static class ShopInfo implements Serializable {
+
+    private static final long serialVersionUID = -3759074878713856529L;
+
+    /**
+     * 配送公司Id.
+     */
+    @SerializedName("goods_info")
+    private WaybillGoodsInfo goodsInfo;
+
+
+  }
+
+
+  /**
+   * 运力信息.
+   */
+  @Data
+  @Accessors(chain = true)
+  public static class DeliveryInfo implements Serializable {
+
+    private static final long serialVersionUID = -3759074878713856529L;
+
+    /**
+     * 配送公司Id.
+     */
+    @SerializedName("delivery_id")
+    private String deliveryId;
+
+    /**
+     * 运力公司名称.
+     */
+    @SerializedName("delivery_name")
+    private String deliveryName;
+
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/MinishopShopCat.java

@@ -0,0 +1,23 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 店铺的商品分类
+ */
+@Data
+public class MinishopShopCat implements Serializable {
+  private static final long serialVersionUID = 4179473856929659641L;
+
+  @SerializedName("cat_id")
+  private Integer shopCatId;
+
+  private String shopCatName;
+
+  private Integer fShopCatId;
+
+  @SerializedName("level")
+  private Integer catLevel;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMiniAfterSaleDetail.java

@@ -0,0 +1,24 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/20 7:16 下午
+ */
+@Data
+public class WxMiniAfterSaleDetail {
+  @SerializedName("aftersale_order_list")
+  private List<AfterSaleOrder> aftersaleOrderList;
+  @SerializedName("on_aftersale_order_cnt")
+  private Integer onAftersaleOrderCnt;
+
+  @Data
+  public static class AfterSaleOrder {
+    @SerializedName("aftersale_order_id")
+    private Long aftersaleOrderId;
+    private Integer status;
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopAddGoodsSkuData.java

@@ -0,0 +1,16 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class WxMinishopAddGoodsSkuData implements Serializable {
+  private static final long serialVersionUID = -2596988603027040989L;
+  @SerializedName("sku_id")
+  private Long skuId;
+  @SerializedName("out_sku_id")
+  private String outSkuId;
+  @SerializedName("create_time")
+  private String createTime;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopAddGoodsSpuData.java

@@ -0,0 +1,16 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class WxMinishopAddGoodsSpuData implements Serializable {
+  private static final long serialVersionUID = 2023708625713948192L;
+  private Long productId;
+
+  private String outProductId;
+
+  private String createTime;
+
+  private String updateTime;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopAddressInfo.java

@@ -0,0 +1,28 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/20 7:32 下午
+ */
+@Data
+public class WxMinishopAddressInfo {
+  @SerializedName("user_name")
+  private String userName;
+  @SerializedName("postal_code")
+  private String postalCode;
+  @SerializedName("province_name")
+  private String provinceName;
+  @SerializedName("city_name")
+  private String cityame;
+  @SerializedName("county_name")
+  private String countyName;
+  @SerializedName("detail_info")
+  private String detailInfo;
+  @SerializedName("national_code")
+  private String nationalCode;
+  @SerializedName("tel_number")
+  private String telNumber;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopDeliveryCompany.java

@@ -0,0 +1,12 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class WxMinishopDeliveryCompany implements Serializable {
+  private static final long serialVersionUID = 3736970376549639779L;
+  private String deliveryId;
+
+  private String deliveryName;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopDeliveryInfo.java

@@ -0,0 +1,62 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/20 7:28 下午
+ */
+@Data
+public class WxMinishopDeliveryInfo {
+  @SerializedName("address_info")
+  private WxMinishopAddressInfo addressInfo;
+  @SerializedName("delivery_method")
+  private String deliveryMethod;
+  @SerializedName("delivery_product_info")
+  private List<DeliveryProductInfo> deliveryProductInfo;
+  @SerializedName("ship_done_time")
+  private Long ship_done_time;
+  @SerializedName("insurance_info")
+  private InsuranceInfo insuranceInfo;
+  @SerializedName("deliver_type")
+  private String deliverType;
+  @SerializedName("offline_delivery_time")
+  private Long offlineDeliveryTime;
+  @SerializedName("offline_pickup_time")
+  private Long offlinePickupTime;
+
+  @Data
+  public static class DeliveryProductInfo {
+    @SerializedName("waybill_id")
+    private String waybillId;
+    @SerializedName("delivery_id")
+    private String deliveryId;
+    @SerializedName("delivery_time")
+    private String deliveryTime;
+    @SerializedName("deliver_type")
+    private String deliverType;
+    @SerializedName("delivery_address")
+    private WxMinishopAddressInfo deliveryAddress;
+    @SerializedName("product_infos")
+    private List<ProductInfo> productInfos;
+  }
+
+  @Data
+  public static class InsuranceInfo {
+    private String type;
+    @SerializedName("insurance_price")
+    private Long insurancePrice;
+  }
+
+  @Data
+  public static class ProductInfo {
+    @SerializedName("product_id")
+    private Long product_id;
+    @SerializedName("sku_id")
+    private Long sku_id;
+    @SerializedName("product_cnt")
+    private Long product_cnt;
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopGoodsSkuAttr.java

@@ -0,0 +1,25 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class WxMinishopGoodsSkuAttr implements Serializable {
+  private static final long serialVersionUID = -7274443170526394680L;
+
+  @SerializedName("attr_key")
+  private String attrKey;
+
+  @SerializedName("attr_value")
+  private String attrValue;
+
+  public JsonObject toJsonObject() {
+    JsonObject jsonObject = new JsonObject();
+    jsonObject.addProperty("attr_key", attrKey);
+    jsonObject.addProperty("attr_value", attrValue);
+
+    return jsonObject;
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopOrderDetail.java

@@ -0,0 +1,48 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2021/3/23
+ */
+@Data
+public class WxMinishopOrderDetail implements Serializable {
+  private static final long serialVersionUID = 3325843289672341160L;
+
+  /**
+   * 下单商品信息
+   * <pre>
+   * 是否必填：是
+   * </pre>
+   */
+  @SerializedName("product_infos")
+  private List<WxMinishopProductInfo> productInfos;
+
+  /**
+   * 支付信息 (当作为返回结果，payorder时action_type!=6时存在)
+   * <pre>
+   * 是否必填：
+   * </pre>
+   */
+  @SerializedName("pay_info")
+  private WxMinishopPayInfo payInfo;
+
+  /**
+   * 价格信息
+   * <pre>
+   * 是否必填：
+   * </pre>
+   */
+  @SerializedName("price_info")
+  private WxMinishopPriceInfo priceInfo;
+
+  /**
+   * 必须调过发货接口才会存在这个字段
+   */
+  @SerializedName("delivery_info")
+  private WxMinishopDeliveryInfo deliveryInfo;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopOrderListResponse.java

@@ -0,0 +1,17 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import cn.binarywang.wx.miniapp.bean.shop.response.WxMaShopBaseResponse;
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/20 7:09 下午
+ */
+@Data
+public class WxMinishopOrderListResponse extends WxMaShopBaseResponse {
+  private List<WxMinishopOrderDetail> orders;
+  @SerializedName("total_num")
+  private Long totalNum;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopOrderResult.java

@@ -0,0 +1,61 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import cn.binarywang.wx.miniapp.bean.shop.WxMaShopOrderDetail;
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2021/3/23
+ */
+@Data
+public class WxMinishopOrderResult implements Serializable {
+  private static final long serialVersionUID = -2665426592693969921L;
+
+  /**
+   * 交易组件平台订单ID
+   */
+  @SerializedName("order_id")
+  private Long orderId;
+
+  /**
+   * 订单状态
+   */
+  @SerializedName("status")
+  private Integer status;
+
+  @SerializedName("create_time")
+  private String createTime;
+
+  @SerializedName("update_time")
+  private String updateTime;
+  /**
+   * 订单详情
+   */
+  @SerializedName("order_detail")
+  private WxMinishopOrderDetail orderDetail;
+
+  @SerializedName("aftersale_detail")
+  private WxMiniAfterSaleDetail afterSaleDetail;
+
+  /**
+   * 商家小程序该订单的用户id
+   */
+  @SerializedName("openid")
+  private String openid;
+
+  @SerializedName("ext_info")
+  private ExtInfo extInfo;
+
+  @SerializedName("order_type")
+  private Integer orderType;
+
+  @Data
+  public static class ExtInfo {
+    @SerializedName("customer_notes")
+    private String customerNotes;
+    @SerializedName("merchant_notes")
+    private String merchantNotes;
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopPayInfo.java

@@ -0,0 +1,54 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2021/3/23
+ */
+@Data
+public class WxMinishopPayInfo implements Serializable {
+  private static final long serialVersionUID = 687488209024968647L;
+
+  @SerializedName("pay_method")
+  private String payMethod;
+
+  /**
+   * 预支付ID
+   * <pre>
+   * 是否必填：是
+   * </pre>
+   */
+  @SerializedName("prepay_id")
+  private String prepayId;
+
+  /**
+   * 预付款时间（拿到prepay_id的时间）
+   * <pre>
+   * 是否必填：是
+   * </pre>
+   */
+  @SerializedName("prepay_time")
+  private String prepayTime;
+
+  // 以下字段仅作为返回数据
+  /**
+   * 支付ID，调过同步订单支付结果且action_type=1时才存在
+   * <pre>
+   * 是否必填：
+   * </pre>
+   */
+  @SerializedName("transaction_id")
+  private String transactionId;
+
+  /**
+   * 付款时间（拿到transaction_id的时间）
+   * <pre>
+   * 是否必填：
+   * </pre>
+   */
+  @SerializedName("pay_time")
+  private String payTime;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopPriceInfo.java

@@ -0,0 +1,44 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2021/3/23
+ */
+@Data
+public class WxMinishopPriceInfo implements Serializable {
+  private static final long serialVersionUID = 1588840927992523263L;
+
+  @SerializedName("product_price")
+  private Integer productPrice;
+  /**
+   * 该订单最终的金额（单位：分）
+   * <pre>
+   * 是否必填：是
+   * </pre>
+   */
+  @SerializedName("order_price")
+  private Integer orderPrice;
+  /**
+   * 运费（单位：分）
+   * <pre>
+   * 是否必填：是
+   * </pre>
+   */
+  @SerializedName("freight")
+  private Integer freight;
+  /**
+   * 优惠金额（单位：分）
+   * <pre>
+   * 是否必填：否
+   * </pre>
+   */
+  @SerializedName("discounted_price")
+  private Integer discountedPrice;
+
+  @SerializedName("is_discounted")
+  private Boolean isDiscounted;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopProductInfo.java

@@ -0,0 +1,65 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2021/3/23
+ */
+@Data
+public class WxMinishopProductInfo implements Serializable {
+  private static final long serialVersionUID = 8979181840150112093L;
+  /**
+   * 交易组件平台内部商品ID
+   */
+  @SerializedName("product_id")
+  private Integer productId;
+
+  /**
+   * 交易组件平台内部skuID，可填0（如果这个product_id下没有sku）
+   */
+  @SerializedName("sku_id")
+  private Integer skuId;
+  /**
+   * 购买的数量
+   * <pre>
+   * 是否必填：是
+   * </pre>
+   */
+  @SerializedName("sku_cnt")
+  private Integer skuCnt;
+
+  @SerializedName("on_aftersale_sku_cnt")
+  private Integer onAftersaleSkuCnt;
+
+  @SerializedName("finish_aftersale_sku_cnt")
+  private Integer finishAftersaleSkuCnt;
+  /**
+   * 生成订单时商品的标题
+   * <pre>
+   * 是否必填：是
+   * </pre>
+   */
+  @SerializedName("title")
+  private String title;
+  @SerializedName("thumb_img")
+  private String thumbImg;
+
+  @SerializedName("sku_attrs")
+  private List<WxMinishopGoodsSkuAttr> skuAttrs;
+  /**
+   * 生成订单时商品的售卖价（单位：分）
+   * <pre>
+   * 是否必填：是
+   * </pre>
+   */
+  @SerializedName("sale_price")
+  private Integer salePrice;
+
+  @SerializedName("market_price")
+  private Integer marketPrice;
+}
+

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopResult.java

@@ -0,0 +1,14 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class WxMinishopResult<T> implements Serializable {
+  private static final long serialVersionUID = 4323118714581265968L;
+  private Integer errcode;
+
+  private String errmsg;
+
+  private T data;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopSku.java

@@ -0,0 +1,41 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class WxMinishopSku implements Serializable {
+  private static final long serialVersionUID = 12373392723136246L;
+
+  @SerializedName("product_id")
+  private Long productId;
+
+  @SerializedName("out_product_id")
+  private String outProductId;
+
+  @SerializedName("out_sku_id")
+  private String outSkuId;
+
+  @SerializedName("thumb_img")
+  private String thumbImg;
+
+  @SerializedName("sale_price")
+  private Integer salePrice;
+
+  @SerializedName("market_price")
+  private Integer marketPrice;
+
+  @SerializedName("stock_num")
+  private Integer stockNum;
+
+  @SerializedName("sku_code")
+  private String skuCode;
+
+  @SerializedName("barcode")
+  private String barCode;
+
+  @SerializedName("sku_attrs")
+  private List<WxMinishopGoodsSkuAttr> skuAttrs;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopSpu.java

@@ -0,0 +1,51 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class WxMinishopSpu implements Serializable {
+  private static final long serialVersionUID = 6689040014027161007L;
+
+  @SerializedName("out_product_id")
+  private String outProductId;
+
+  private String title;
+
+  @SerializedName("sub_title")
+  private String subTitle;
+
+  @SerializedName("head_img")
+  private List<String> headImgs;
+
+  @SerializedName("desc_info")
+  private DescInfo descInfo;
+
+  @SerializedName("brand_id")
+  private Long brandId;
+
+  @SerializedName("cats")
+  private List<MinishopShopCat> shopCats;
+
+  private List<WxMinishopGoodsSkuAttr> attrs;
+
+  private String model;
+
+  @SerializedName("express_info")
+  private ExpressInfo expressInfo;
+
+  private List<WxMinishopSku> skus;
+
+  @Data
+  public static class DescInfo {
+    private List<String> imgs;
+  }
+
+  @Data
+  public static class ExpressInfo {
+    @SerializedName("template_id")
+    private Long templateId;
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopSpuGet.java

@@ -0,0 +1,16 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/20 4:36 下午
+ */
+@Data
+public class WxMinishopSpuGet implements Serializable {
+
+  private static final long serialVersionUID = -957810527714924409L;
+
+  private WxMinishopSpu spu;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopSpuGetResponse.java

@@ -0,0 +1,12 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/20 4:46 下午
+ */
+@Data
+public class WxMinishopSpuGetResponse extends WxMinishopResult<WxMinishopSpuGet> {
+
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopSpuListResponse.java

@@ -0,0 +1,17 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/20 4:46 下午
+ */
+@Data
+public class WxMinishopSpuListResponse extends WxMinishopResult {
+  @SerializedName("total_num")
+  private Long totalNum;
+
+  private List<WxMinishopSpu> spus;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/product/WxMinishopUpdateGoodsSkuData.java

@@ -0,0 +1,16 @@
+package cn.binarywang.wx.miniapp.bean.product;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class WxMinishopUpdateGoodsSkuData implements Serializable {
+  private static final long serialVersionUID = -2596988603027040989L;
+  @SerializedName("sku_id")
+  private Long skuId;
+  @SerializedName("out_sku_id")
+  private String outSkuId;
+  @SerializedName("update_time")
+  private String updateTime;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaPromotionInfo.java

@@ -0,0 +1,24 @@
+package cn.binarywang.wx.miniapp.bean.shop;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/18 3:14 下午
+ */
+@Data
+public class WxMaPromotionInfo implements Serializable {
+
+  private static final long serialVersionUID = 2090629980847386450L;
+
+  @SerializedName("finder_username")
+  private String finderUsername;
+  @SerializedName("finder_nickname")
+  private String finderNickname;
+  @SerializedName("sharer_openid")
+  private String sharerOpenid;
+  @SerializedName("live_start_time")
+  private String liveStartTime;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopOrderDetail.java

@@ -14,6 +14,7 @@ import java.util.List;
 public class WxMaShopOrderDetail implements Serializable {
   private static final long serialVersionUID = 3325843289672341160L;
 
+
   /**
    * 推广员、分享员信息
    */

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopPayInfo.java

@@ -21,6 +21,9 @@ public class WxMaShopPayInfo implements Serializable {
   @SerializedName("pay_method_type")
   private Integer payMethodType;
 
+  @SerializedName("pay_method")
+  private String payMethod;
+
   /**
    * 预支付ID
    * <pre>

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/WxMaShopProductInfo.java

@@ -88,5 +88,8 @@ public class WxMaShopProductInfo implements Serializable {
    */
   @SerializedName("real_price")
   private Integer realPrice;
+
+  @SerializedName("sku_real_price")
+  private Integer skuRealPrice;
 }
 

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/request/WxMaShopDeliverySendRequest.java

@@ -1,5 +1,6 @@
 package cn.binarywang.wx.miniapp.bean.shop.request;
 
+import cn.binarywang.wx.miniapp.bean.shop.request.WxMaShopAfterSaleAddRequest.ProductInfosBean;
 import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -38,6 +39,8 @@ public class WxMaShopDeliverySendRequest implements Serializable {
   private Integer finishAllDelivery;
   @SerializedName("delivery_list")
   private List<DeliveryListBean> deliveryList;
+  @SerializedName("ship_done_time")
+  private String shipDoneTme;
 
   @Data
   @Builder
@@ -53,5 +56,7 @@ public class WxMaShopDeliverySendRequest implements Serializable {
     private String deliveryId;
     @SerializedName("waybill_id")
     private String waybillId;
+    @SerializedName("product_info_list")
+    private List<ProductInfosBean> productInfoList;
   }
 }

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopSearchSharerResponse.java

@@ -0,0 +1,24 @@
+package cn.binarywang.wx.miniapp.bean.shop.response;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/18 2:58 下午
+ */
+@Data
+public class WxMaShopSearchSharerResponse extends WxMaShopBaseResponse implements Serializable {
+
+  private static final long serialVersionUID = 2049214239752832818L;
+
+  @SerializedName("invited_time")
+  private Long invitedTime;
+  @SerializedName("bind_time")
+  private Long bindTime;
+  @SerializedName("nickname")
+  private String nickname;
+  @SerializedName("bind_status")
+  private Integer bindStatus;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopSharerBindResponse.java

@@ -0,0 +1,40 @@
+package cn.binarywang.wx.miniapp.bean.shop.response;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author leiin
+ * @date 2022/6/18 2:51 下午
+ */
+@Data
+public class WxMaShopSharerBindResponse extends WxMaShopBaseResponse implements Serializable {
+
+  private static final long serialVersionUID = 5648529892711033276L;
+
+  @SerializedName("success_list")
+  private List<String> successList;
+
+  @SerializedName("fail_list")
+  private List<String> failList;
+
+  @SerializedName("refuse_list")
+  private List<String> refuseList;
+
+  @SerializedName("result_list")
+  private List<ResultListItem> resultList;
+
+  @Getter
+  @Setter
+  public static class ResultListItem {
+    private String openid;
+    @SerializedName("result_code")
+    private Integer resultCode;
+    @SerializedName("reason_code")
+    private Integer reasonCode;
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopSharerDataSummaryResponse.java

@@ -0,0 +1,21 @@
+package cn.binarywang.wx.miniapp.bean.shop.response;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/18 2:53 下午
+ */
+@Data
+public class WxMaShopSharerDataSummaryResponse extends WxMaShopBaseResponse implements Serializable {
+
+  private static final long serialVersionUID = 3985829585979186778L;
+
+  private Long gmv;
+  @SerializedName("order_cnt")
+  private Long orderCnt;
+  @SerializedName("user_cnt")
+  private Long userCnt;
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopSharerListResponse.java

@@ -0,0 +1,30 @@
+package cn.binarywang.wx.miniapp.bean.shop.response;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/18 2:55 下午
+ */
+@Data
+public class WxMaShopSharerListResponse extends WxMaShopBaseResponse implements Serializable {
+
+  private static final long serialVersionUID = -8533731677643022825L;
+
+  private List<SharerInfo> sharers;
+  @SerializedName("total_num")
+  private Integer totalNum;
+
+  @Data
+  public static class SharerInfo {
+    private String openid;
+    @SerializedName("invited_time")
+    private Long invitedTime;
+    @SerializedName("bind_time")
+    private Long bindTime;
+    private String nickname;
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopSharerLiveOrderListResponse.java

@@ -0,0 +1,34 @@
+package cn.binarywang.wx.miniapp.bean.shop.response;
+
+import cn.binarywang.wx.miniapp.bean.shop.WxMaShopOrderDetail;
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/18 2:56 下午
+ */
+@Data
+public class WxMaShopSharerLiveOrderListResponse extends WxMaShopBaseResponse implements Serializable {
+
+  private static final long serialVersionUID = -4190199778148290127L;
+
+  private List<WxMaShopOrderItem> orders;
+
+  @SerializedName("total_num")
+  private Integer totalNum;
+
+  @Data
+  public static class WxMaShopOrderItem {
+    @SerializedName("order_id")
+    private Long orderId;
+    @SerializedName("out_order_id")
+    private String outOrderId;
+    private Integer status;
+    private String path;
+    @SerializedName("order_detail")
+    private WxMaShopOrderDetail orderDetail;
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopSharerLiveSummaryListResponse.java

@@ -0,0 +1,41 @@
+package cn.binarywang.wx.miniapp.bean.shop.response;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/18 2:57 下午
+ */
+@Data
+public class WxMaShopSharerLiveSummaryListResponse extends WxMaShopBaseResponse implements Serializable {
+
+  private static final long serialVersionUID = -2085366863029618067L;
+
+  private List<LiveSummaryItem> lives;
+
+  @SerializedName("total_num")
+  private Integer totalNum;
+
+  @Data
+  public static class LiveSummaryItem {
+    @SerializedName("live_export_id")
+    private String liveExportId;
+    @SerializedName("live_nickname")
+    private String liveNickname;
+    @SerializedName("live_start_time")
+    private Long liveStartTime;
+    @SerializedName("live_end_time")
+    private Long liveEndTime;
+    @SerializedName("live_status")
+    private Long liveStatus;
+    @SerializedName("gmv")
+    private Long gmv;
+    @SerializedName("order_cnt")
+    private Long orderCnt;
+    @SerializedName("user_cnt")
+    private Long userCnt;
+  }
+}

weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/shop/response/WxMaShopSharerUnbindResponse.java

@@ -0,0 +1,25 @@
+package cn.binarywang.wx.miniapp.bean.shop.response;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.Serializable;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author leiin
+ * @date 2022/6/18 3:00 下午
+ */
+@Data
+public class WxMaShopSharerUnbindResponse extends WxMaShopBaseResponse implements Serializable {
+
+  private static final long serialVersionUID = -9015680115600175408L;
+
+  @SerializedName("success_list")
+  private List<String> successList;
+
+  @SerializedName("fail_list")
+  private List<String> failList;
+
+  @SerializedName("refuse_list")
+  private List<String> refuseList;
+}