Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,13 @@ public interface WxChannelService extends BaseWxChannelService {
*/
WxLeagueWindowService getLeagueWindowService();

/**
* 代发管理服务
*
* @return 代发管理服务
*/
WxChannelSupplierService getSupplierService();

/**
* 优选联盟-团长服务
*
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package me.chanjar.weixin.channel.api;

import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse;
import me.chanjar.weixin.channel.bean.supplier.DistributeTypeResponse;
import me.chanjar.weixin.channel.bean.supplier.DropshipAssignRequest;
import me.chanjar.weixin.channel.bean.supplier.DropshipDetailResponse;
import me.chanjar.weixin.channel.bean.supplier.DropshipListRequest;
import me.chanjar.weixin.channel.bean.supplier.DropshipListResponse;
import me.chanjar.weixin.channel.bean.supplier.DropshipResponse;
import me.chanjar.weixin.channel.bean.supplier.DropshipSearchRequest;
import me.chanjar.weixin.channel.bean.supplier.ProductDistributeRequest;
import me.chanjar.weixin.channel.bean.supplier.ProductListResponse;
import me.chanjar.weixin.channel.bean.supplier.SupplierInfoResponse;
import me.chanjar.weixin.channel.bean.supplier.SupplierListResponse;
import me.chanjar.weixin.common.error.WxErrorException;

/**
* 视频号小店代发管理服务。
*
* @author <a href="https://github.com/github-copilot">GitHub Copilot</a>
* @link <a href="https://developers.weixin.qq.com/doc/channels/API/supplier/">代发管理接口文档</a>
*/
public interface WxChannelSupplierService {

/** 获取供货商列表。 */
SupplierListResponse getSupplierList() throws WxErrorException;

/** 获取分配方式。 */
DistributeTypeResponse getDistribute() throws WxErrorException;

/** 设置全店订单手动分配。 */
WxChannelBaseResponse setManuallyDistribute() throws WxErrorException;

/** 设置全店订单自动分配。 */
WxChannelBaseResponse setAllDistribute(String supplierId) throws WxErrorException;

/** 设置按商品自动分配。 */
WxChannelBaseResponse setProductDistribute(ProductDistributeRequest req) throws WxErrorException;

/** 获取商品对应的自动分配供货商。 */
SupplierInfoResponse getProductDefaultDistribute(String productId) throws WxErrorException;

/** 获取按商品自动分配的商品列表。 */
ProductListResponse getProductList(String supplierId) throws WxErrorException;

/** 分配订单代发。 */
DropshipResponse assignOrder(DropshipAssignRequest req) throws WxErrorException;

/** 取消分配代发单。 */
WxChannelBaseResponse cancelDropship(String orderId) throws WxErrorException;

/** 查询代发单详情。 */
DropshipDetailResponse getDropship(String orderId) throws WxErrorException;

/** 拉取代发单列表。 */
DropshipListResponse listDropship(DropshipListRequest req) throws WxErrorException;

/** 搜索代发单。 */
DropshipListResponse searchDropship(DropshipSearchRequest req) throws WxErrorException;
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public abstract class BaseWxChannelServiceImpl<H, P> implements WxChannelService
private WxStoreHomePageService homePageService = null;
private WxStoreCooperationService cooperationService = null;
private WxChannelCompassShopService compassShopService = null;
private WxChannelSupplierService supplierService = null;
private WxLeagueWindowService leagueWindowService = null;
private WxLeagueSupplierService leagueSupplierService = null;
private WxLeaguePromoterService leaguePromoterService = null;
Expand Down Expand Up @@ -392,6 +393,14 @@ public synchronized WxChannelCompassShopService getCompassShopService() {
return compassShopService;
}

@Override
public synchronized WxChannelSupplierService getSupplierService() {
if (supplierService == null) {
supplierService = new WxChannelSupplierServiceImpl(this);
}
return supplierService;
}

@Override
public synchronized WxLeagueWindowService getLeagueWindowService() {
if (leagueWindowService == null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
package me.chanjar.weixin.channel.api.impl;

import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.channel.api.WxChannelSupplierService;
import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse;
import me.chanjar.weixin.channel.bean.supplier.DistributeTypeResponse;
import me.chanjar.weixin.channel.bean.supplier.DropshipAssignRequest;
import me.chanjar.weixin.channel.bean.supplier.DropshipDetailResponse;
import me.chanjar.weixin.channel.bean.supplier.DropshipListRequest;
import me.chanjar.weixin.channel.bean.supplier.DropshipListResponse;
import me.chanjar.weixin.channel.bean.supplier.DropshipResponse;
import me.chanjar.weixin.channel.bean.supplier.DropshipSearchRequest;
import me.chanjar.weixin.channel.bean.supplier.ProductDistributeRequest;
import me.chanjar.weixin.channel.bean.supplier.ProductListResponse;
import me.chanjar.weixin.channel.bean.supplier.SupplierInfoResponse;
import me.chanjar.weixin.channel.bean.supplier.SupplierListResponse;
import me.chanjar.weixin.channel.util.ResponseUtils;
import me.chanjar.weixin.common.error.WxErrorException;

import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.ASSIGN_DROPSHIP_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.CANCEL_DROPSHIP_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.GET_DISTRIBUTE_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.GET_DROPSHIP_LIST_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.GET_DROPSHIP_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.GET_PRODUCT_DEFAULT_DISTRIBUTE_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.GET_PRODUCT_LIST_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.GET_SUPPLIER_LIST_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.SEARCH_DROPSHIP_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.SET_ALL_DISTRIBUTION_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.SET_MANUALLY_DISTRIBUTE_URL;
import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Supplier.SET_PRODUCT_DISTRIBUTE_URL;

/**
* 视频号小店代发管理服务。
*
* @author <a href="https://github.com/github-copilot">GitHub Copilot</a>
*/
@Slf4j
public class WxChannelSupplierServiceImpl implements WxChannelSupplierService {

private final BaseWxChannelServiceImpl<?, ?> shopService;

public WxChannelSupplierServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
this.shopService = shopService;
}

@Override
public SupplierListResponse getSupplierList() throws WxErrorException {
String respJson = shopService.post(GET_SUPPLIER_LIST_URL, "{}");
Comment on lines +48 to +49
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Expose pagination parameters for supplier lists

When a merchant has more suppliers than the first page, callers cannot retrieve the next page: the response model exposes has_more/next_key, but this method always posts an empty body and the public API has no way to send the returned cursor (or page size). This makes the service silently unusable for complete supplier enumeration once has_more is true.

Useful? React with 👍 / 👎.

return ResponseUtils.decode(respJson, SupplierListResponse.class);
}

@Override
public DistributeTypeResponse getDistribute() throws WxErrorException {
String respJson = shopService.post(GET_DISTRIBUTE_URL, "{}");
return ResponseUtils.decode(respJson, DistributeTypeResponse.class);
}

@Override
public WxChannelBaseResponse setManuallyDistribute() throws WxErrorException {
String respJson = shopService.post(SET_MANUALLY_DISTRIBUTE_URL, "{}");
return ResponseUtils.decode(respJson, WxChannelBaseResponse.class);
}

@Override
public WxChannelBaseResponse setAllDistribute(String supplierId) throws WxErrorException {
ProductDistributeRequest req = new ProductDistributeRequest();
req.setSupplierId(supplierId);
String respJson = shopService.post(SET_ALL_DISTRIBUTION_URL, req);
return ResponseUtils.decode(respJson, WxChannelBaseResponse.class);
}
Comment on lines +66 to +71

@Override
public WxChannelBaseResponse setProductDistribute(ProductDistributeRequest req) throws WxErrorException {
String respJson = shopService.post(SET_PRODUCT_DISTRIBUTE_URL, req);
return ResponseUtils.decode(respJson, WxChannelBaseResponse.class);
}

@Override
public SupplierInfoResponse getProductDefaultDistribute(String productId) throws WxErrorException {
String respJson = shopService.post(GET_PRODUCT_DEFAULT_DISTRIBUTE_URL, "{\"product_id\":\"" + productId + "\"}");
return ResponseUtils.decode(respJson, SupplierInfoResponse.class);
}

@Override
public ProductListResponse getProductList(String supplierId) throws WxErrorException {
String respJson = shopService.post(GET_PRODUCT_LIST_URL, "{\"supplier_id\":\"" + supplierId + "\"}");
return ResponseUtils.decode(respJson, ProductListResponse.class);
}

@Override
public DropshipResponse assignOrder(DropshipAssignRequest req) throws WxErrorException {
String respJson = shopService.post(ASSIGN_DROPSHIP_URL, req);
return ResponseUtils.decode(respJson, DropshipResponse.class);
}

@Override
public WxChannelBaseResponse cancelDropship(String orderId) throws WxErrorException {
String respJson = shopService.post(CANCEL_DROPSHIP_URL, "{\"order_id\":\"" + orderId + "\"}");
return ResponseUtils.decode(respJson, WxChannelBaseResponse.class);
}

@Override
public DropshipDetailResponse getDropship(String orderId) throws WxErrorException {
String respJson = shopService.post(GET_DROPSHIP_URL, "{\"order_id\":\"" + orderId + "\"}");
return ResponseUtils.decode(respJson, DropshipDetailResponse.class);
}

@Override
public DropshipListResponse listDropship(DropshipListRequest req) throws WxErrorException {
String respJson = shopService.post(GET_DROPSHIP_LIST_URL, req);
return ResponseUtils.decode(respJson, DropshipListResponse.class);
}

@Override
public DropshipListResponse searchDropship(DropshipSearchRequest req) throws WxErrorException {
String respJson = shopService.post(SEARCH_DROPSHIP_URL, req);
return ResponseUtils.decode(respJson, DropshipListResponse.class);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package me.chanjar.weixin.channel.bean.supplier;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse;

/**
* 分配方式响应。
*
* @author <a href="https://github.com/github-copilot">GitHub Copilot</a>
*/
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class DistributeTypeResponse extends WxChannelBaseResponse {
private static final long serialVersionUID = -750860556286328053L;

@JsonProperty("distribute_type")
private Integer distributeType;

@JsonProperty("supplier_info")
private SupplierInfo supplierInfo;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package me.chanjar.weixin.channel.bean.supplier;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import lombok.Data;
import lombok.NoArgsConstructor;

/**
* 代发单分配请求。
*
* @author <a href="https://github.com/github-copilot">GitHub Copilot</a>
*/
@Data
@NoArgsConstructor
@JsonInclude(JsonInclude.Include.NON_NULL)
public class DropshipAssignRequest implements Serializable {
private static final long serialVersionUID = 6945436332042017565L;

@JsonProperty("order_id")
private String orderId;

@JsonProperty("supplier_id")
private String supplierId;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package me.chanjar.weixin.channel.bean.supplier;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse;

/**
* 代发单详情响应。
*
* @author <a href="https://github.com/github-copilot">GitHub Copilot</a>
*/
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class DropshipDetailResponse extends WxChannelBaseResponse {
private static final long serialVersionUID = 5548774863400272707L;

@JsonProperty("dropship_info")
private DropshipInfo dropshipInfo;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package me.chanjar.weixin.channel.bean.supplier;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import lombok.Data;
import lombok.NoArgsConstructor;

/**
* 代发单信息。
*
* @author <a href="https://github.com/github-copilot">GitHub Copilot</a>
*/
@Data
@NoArgsConstructor
@JsonInclude(JsonInclude.Include.NON_NULL)
public class DropshipInfo implements Serializable {
private static final long serialVersionUID = -7880364210849039278L;

@JsonProperty("order_id")
private String orderId;

@JsonProperty("supplier_id")
private String supplierId;

@JsonProperty("dropship_id")
private String dropshipId;
Comment on lines +26 to +27
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Map dropship order ids with the API field name

When deserializing real dropship records, this field will remain null because the WeChat shop order payload uses ds_order_id for the dropship order number (the existing me.chanjar.weixin.channel.bean.order.DropshipInfo model already maps that key), not dropship_id. This affects list/detail/assign responses that need to expose the returned dropship order id to callers.

Useful? React with 👍 / 👎.


@JsonProperty("status")
private Integer status;

@JsonProperty("create_time")
private Long createTime;

@JsonProperty("update_time")
private Long updateTime;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package me.chanjar.weixin.channel.bean.supplier;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import lombok.Data;
import lombok.NoArgsConstructor;

/**
* 代发单列表请求。
*
* @author <a href="https://github.com/github-copilot">GitHub Copilot</a>
*/
@Data
@NoArgsConstructor
@JsonInclude(JsonInclude.Include.NON_NULL)
public class DropshipListRequest implements Serializable {
private static final long serialVersionUID = 2638071229335192596L;

@JsonProperty("supplier_id")
private String supplierId;

@JsonProperty("status")
private Integer status;

@JsonProperty("create_time_start")
private Long createTimeStart;

@JsonProperty("create_time_end")
private Long createTimeEnd;

@JsonProperty("page_size")
private Integer pageSize;

@JsonProperty("next_key")
private String nextKey;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package me.chanjar.weixin.channel.bean.supplier;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse;

/**
* 代发单列表响应。
*
* @author <a href="https://github.com/github-copilot">GitHub Copilot</a>
*/
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class DropshipListResponse extends WxChannelBaseResponse {
private static final long serialVersionUID = -2850183412032417307L;

@JsonProperty("dropship_list")
private List<DropshipInfo> dropshipList;

@JsonProperty("next_key")
private String nextKey;

@JsonProperty("has_more")
private Boolean hasMore;
}
Loading