](https://hellogithub.com/repository/6de6147050c94db4aedfd7098d19f8d8)
[{@link com.binarywang.wxjava.store.api.WxStoreService#setMaxRetryTimes(int)}
+ *{@link com.binarywang.wxjava.store.api.impl.BaseWxStoreServiceImpl#setMaxRetryTimes(int)}
+ */ + private int maxRetryTimes = 5; + + /** + * http 请求重试间隔 + * + *{@link com.binarywang.wxjava.store.api.WxStoreService#setRetrySleepMillis(int)}
+ *{@link com.binarywang.wxjava.store.api.impl.BaseWxStoreServiceImpl#setRetrySleepMillis(int)}
+ */ + private int retrySleepMillis = 1000; + } +} diff --git a/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/properties/WxStoreMultiRedisProperties.java b/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/properties/WxStoreMultiRedisProperties.java new file mode 100644 index 0000000000..1df12ab720 --- /dev/null +++ b/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/properties/WxStoreMultiRedisProperties.java @@ -0,0 +1,63 @@ +package com.binarywang.solon.wxjava.store.properties; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * Redis配置 + * + * @author Winnie + * @date 2024/9/13 + */ +@Data +@NoArgsConstructor +public class WxStoreMultiRedisProperties implements Serializable { + private static final long serialVersionUID = 9061055444734277357L; + + /** + * 主机地址. + */ + private String host = "127.0.0.1"; + + /** + * 端口号. + */ + private int port = 6379; + + /** + * 密码. + */ + private String password; + + /** + * 超时. + */ + private int timeout = 2000; + + /** + * 数据库. + */ + private int database = 0; + + /** + * 最大活动连接数 + */ + private Integer maxActive; + + /** + * 最大空闲连接数 + */ + private Integer maxIdle; + + /** + * 最小空闲连接数 + */ + private Integer minIdle; + + /** + * 最大等待时间 + */ + private Integer maxWaitMillis; +} diff --git a/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/properties/WxStoreSingleProperties.java b/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/properties/WxStoreSingleProperties.java new file mode 100644 index 0000000000..47c31fe886 --- /dev/null +++ b/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/properties/WxStoreSingleProperties.java @@ -0,0 +1,43 @@ +package com.binarywang.solon.wxjava.store.properties; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 微信小店相关配置属性 + * + * @author Winnie + * @date 2024/9/13 + */ +@Data +@NoArgsConstructor +public class WxStoreSingleProperties implements Serializable { + private static final long serialVersionUID = 5306630351265124825L; + + /** + * 设置微信小店的 appid. + */ + private String appId; + + /** + * 设置微信小店的 secret. + */ + private String secret; + + /** + * 设置微信小店的 token. + */ + private String token; + + /** + * 设置微信小店的 EncodingAESKey. + */ + private String aesKey; + + /** + * 是否使用稳定版 Access Token + */ + private boolean useStableAccessToken = false; +} diff --git a/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/service/WxStoreMultiServices.java b/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/service/WxStoreMultiServices.java new file mode 100644 index 0000000000..f059819909 --- /dev/null +++ b/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/service/WxStoreMultiServices.java @@ -0,0 +1,26 @@ +package com.binarywang.solon.wxjava.store.service; + +import com.binarywang.wxjava.store.api.WxStoreService; + +/** + * 视频号 {@link WxStoreService} 所有实例存放类. + * + * @author Winnie + * @date 2024/9/13 + */ +public interface WxStoreMultiServices { + /** + * 通过租户 Id 获取 WxStoreService + * + * @param tenantId 租户 Id + * @return WxStoreService + */ + WxStoreService getWxStoreService(String tenantId); + + /** + * 根据租户 Id，从列表中移除一个 WxStoreService 实例 + * + * @param tenantId 租户 Id + */ + void removeWxStoreService(String tenantId); +} diff --git a/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/service/WxStoreMultiServicesImpl.java b/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/service/WxStoreMultiServicesImpl.java new file mode 100644 index 0000000000..daa6cb1305 --- /dev/null +++ b/solon-plugins/wx-java-store-multi-solon-plugin/src/main/java/com/binarywang/solon/wxjava/store/service/WxStoreMultiServicesImpl.java @@ -0,0 +1,36 @@ +package com.binarywang.solon.wxjava.store.service; + +import com.binarywang.wxjava.store.api.WxStoreService; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 视频号 {@link WxStoreMultiServices} 实现 + * + * @author Winnie + * @date 2024/9/13 + */ +public class WxStoreMultiServicesImpl implements WxStoreMultiServices { + private final Map
+ * {@link com.binarywang.wxjava.store.api.BaseWxStoreService#setRetrySleepMillis(int)}
+ *
+ */
+ private int retrySleepMillis = 1000;
+ /**
+ * http 请求最大重试次数
+ *
+ * {@link com.binarywang.wxjava.store.api.BaseWxStoreService#setMaxRetryTimes(int)}
+ *
+ */
+ private int maxRetryTimes = 5;
+ }
+
+}
diff --git a/solon-plugins/wx-java-store-solon-plugin/src/main/resources/META-INF/solon/wx-java-store-solon-plugin.properties b/solon-plugins/wx-java-store-solon-plugin/src/main/resources/META-INF/solon/wx-java-store-solon-plugin.properties
new file mode 100644
index 0000000000..fd2f516d62
--- /dev/null
+++ b/solon-plugins/wx-java-store-solon-plugin/src/main/resources/META-INF/solon/wx-java-store-solon-plugin.properties
@@ -0,0 +1,2 @@
+solon.plugin=com.binarywang.solon.wxjava.store.integration.WxStorePluginImpl
+solon.plugin.priority=10
diff --git a/solon-plugins/wx-java-store-solon-plugin/src/test/java/features/test/LoadTest.java b/solon-plugins/wx-java-store-solon-plugin/src/test/java/features/test/LoadTest.java
new file mode 100644
index 0000000000..d049f5a51a
--- /dev/null
+++ b/solon-plugins/wx-java-store-solon-plugin/src/test/java/features/test/LoadTest.java
@@ -0,0 +1,15 @@
+package features.test;
+
+import org.junit.jupiter.api.Test;
+import org.noear.solon.test.SolonTest;
+
+/**
+ * @author noear 2024/9/4 created
+ */
+@SolonTest
+public class LoadTest {
+ @Test
+ public void load(){
+
+ }
+}
diff --git a/solon-plugins/wx-java-store-solon-plugin/src/test/resources/app.yml b/solon-plugins/wx-java-store-solon-plugin/src/test/resources/app.yml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 9de6f2d82d..24c45074bb 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
使用自建应用 Secret 时，需要填写对应应用的 AgentId。
*使用通讯录同步 Secret 时，无需填写此字段。
*/ - private Integer agentId; + private Long agentId; /** * 微信企业号应用 EncodingAESKey */ diff --git a/spring-boot-starters/wx-java-cp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-cp-spring-boot-starter/pom.xml index 9e204e82cb..08d352231c 100644 --- a/spring-boot-starters/wx-java-cp-spring-boot-starter/pom.xml +++ b/spring-boot-starters/wx-java-cp-spring-boot-starter/pom.xml @@ -4,7 +4,7 @@{@link com.binarywang.wxjava.store.api.WxStoreService#setMaxRetryTimes(int)}
+ *{@link com.binarywang.wxjava.store.api.impl.BaseWxStoreServiceImpl#setMaxRetryTimes(int)}
+ */ + private int maxRetryTimes = 5; + + /** + * http 请求重试间隔 + * + *{@link com.binarywang.wxjava.store.api.WxStoreService#setRetrySleepMillis(int)}
+ *{@link com.binarywang.wxjava.store.api.impl.BaseWxStoreServiceImpl#setRetrySleepMillis(int)}
+ */ + private int retrySleepMillis = 1000; + } +} diff --git a/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/properties/WxStoreMultiRedisProperties.java b/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/properties/WxStoreMultiRedisProperties.java new file mode 100644 index 0000000000..828325c3bf --- /dev/null +++ b/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/properties/WxStoreMultiRedisProperties.java @@ -0,0 +1,63 @@ +package com.binarywang.spring.starter.wxjava.store.properties; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * Redis配置 + * + * @author Winnie + * @date 2024/9/13 + */ +@Data +@NoArgsConstructor +public class WxStoreMultiRedisProperties implements Serializable { + private static final long serialVersionUID = 9061055444734277357L; + + /** + * 主机地址. + */ + private String host = "127.0.0.1"; + + /** + * 端口号. + */ + private int port = 6379; + + /** + * 密码. + */ + private String password; + + /** + * 超时. + */ + private int timeout = 2000; + + /** + * 数据库. + */ + private int database = 0; + + /** + * 最大活动连接数 + */ + private Integer maxActive; + + /** + * 最大空闲连接数 + */ + private Integer maxIdle; + + /** + * 最小空闲连接数 + */ + private Integer minIdle; + + /** + * 最大等待时间 + */ + private Integer maxWaitMillis; +} diff --git a/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/properties/WxStoreSingleProperties.java b/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/properties/WxStoreSingleProperties.java new file mode 100644 index 0000000000..335147c7b7 --- /dev/null +++ b/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/properties/WxStoreSingleProperties.java @@ -0,0 +1,55 @@ +package com.binarywang.spring.starter.wxjava.store.properties; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 微信小店相关配置属性 + * + * @author Winnie + * @date 2024/9/13 + */ +@Data +@NoArgsConstructor +public class WxStoreSingleProperties implements Serializable { + private static final long serialVersionUID = 5306630351265124825L; + + /** + * 设置微信小店的 appid. + */ + private String appId; + + /** + * 设置微信小店的 secret. + */ + private String secret; + + /** + * 设置微信小店的 token. + */ + private String token; + + /** + * 设置微信小店的 EncodingAESKey. + */ + private String aesKey; + + /** + * 是否使用稳定版 Access Token + */ + private boolean useStableAccessToken = false; + + /** + * 自定义API主机地址，用于替换默认的 https://api.weixin.qq.com + * 例如：http://proxy.company.com:8080 + */ + private String apiHostUrl; + + /** + * 自定义获取AccessToken地址，用于向自定义统一服务获取AccessToken + * 例如：http://proxy.company.com:8080/oauth/token + */ + private String accessTokenUrl; +} diff --git a/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/service/WxStoreMultiServices.java b/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/service/WxStoreMultiServices.java new file mode 100644 index 0000000000..ff5192ac48 --- /dev/null +++ b/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/service/WxStoreMultiServices.java @@ -0,0 +1,26 @@ +package com.binarywang.spring.starter.wxjava.store.service; + +import com.binarywang.wxjava.store.api.WxStoreService; + +/** + * 视频号 {@link WxStoreService} 所有实例存放类. + * + * @author Winnie + * @date 2024/9/13 + */ +public interface WxStoreMultiServices { + /** + * 通过租户 Id 获取 WxStoreService + * + * @param tenantId 租户 Id + * @return WxStoreService + */ + WxStoreService getWxStoreService(String tenantId); + + /** + * 根据租户 Id，从列表中移除一个 WxStoreService 实例 + * + * @param tenantId 租户 Id + */ + void removeWxStoreService(String tenantId); +} diff --git a/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/service/WxStoreMultiServicesImpl.java b/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/service/WxStoreMultiServicesImpl.java new file mode 100644 index 0000000000..44fe0f947d --- /dev/null +++ b/spring-boot-starters/wx-java-store-multi-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/store/service/WxStoreMultiServicesImpl.java @@ -0,0 +1,36 @@ +package com.binarywang.spring.starter.wxjava.store.service; + +import com.binarywang.wxjava.store.api.WxStoreService; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * 视频号 {@link WxStoreMultiServices} 实现 + * + * @author Winnie + * @date 2024/9/13 + */ +public class WxStoreMultiServicesImpl implements WxStoreMultiServices { + private final Map
+ * {@link com.binarywang.wxjava.store.api.BaseWxStoreService#setRetrySleepMillis(int)}
+ *
+ */
+ private int retrySleepMillis = 1000;
+ /**
+ * http 请求最大重试次数
+ *
+ * {@link com.binarywang.wxjava.store.api.BaseWxStoreService#setMaxRetryTimes(int)}
+ *
+ */
+ private int maxRetryTimes = 5;
+ }
+
+}
diff --git a/spring-boot-starters/wx-java-store-spring-boot-starter/src/main/resources/META-INF/spring.factories b/spring-boot-starters/wx-java-store-spring-boot-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000000..cbf38ae2c2
--- /dev/null
+++ b/spring-boot-starters/wx-java-store-spring-boot-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+ com.binarywang.spring.starter.wxjava.store.config.WxStoreAutoConfiguration
diff --git a/spring-boot-starters/wx-java-store-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-boot-starters/wx-java-store-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000000..80044c332a
--- /dev/null
+++ b/spring-boot-starters/wx-java-store-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.binarywang.spring.starter.wxjava.store.config.WxStoreAutoConfiguration
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index 881dc911fe..f689fe886f 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
字段按官方文档动态透传，避免非官方字段定义。
+ * + * @author GitHub Copilot + */ +@Data +@NoArgsConstructor +public abstract class AbstractEwaybillRequest implements Serializable { + + private static final long serialVersionUID = 4213577159985597237L; + + @JsonIgnore + private Map未显式声明字段将保存到 extra 字段，便于兼容官方接口变更。
+ * + * @author GitHub Copilot + */ +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +public abstract class AbstractEwaybillResponse extends WxChannelBaseResponse { + + private static final long serialVersionUID = -2460196179063989718L; + + @JsonIgnore + private Map
@@ -65,6 +65,6 @@ public interface WxCpAgentService {
* @return admin list
* @throws WxErrorException the wx error exception
*/
- WxCpTpAdmin getAdminList(Integer agentId) throws WxErrorException;
+ WxCpTpAdmin getAdminList(Long agentId) throws WxErrorException;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpCorpGroupService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpCorpGroupService.java
index 69aea4bca7..16882669b7 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpCorpGroupService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpCorpGroupService.java
@@ -23,5 +23,5 @@ public interface WxCpCorpGroupService {
* @return the list
* @throws WxErrorException the wx error exception
*/
- List listAppShareInfo(Integer agentId, Integer businessType, String corpId, Integer limit, String cursor) throws WxErrorException;
+ List listAppShareInfo(Long agentId, Integer businessType, String corpId, Integer limit, String cursor) throws WxErrorException;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpIntelligentRobotService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpIntelligentRobotService.java
index 58f4373ceb..1d71bac99a 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpIntelligentRobotService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpIntelligentRobotService.java
@@ -82,4 +82,40 @@ public interface WxCpIntelligentRobotService {
*/
WxCpIntelligentRobotMessage parseCallbackMessage(String callbackMessageJson);
+ /**
+ * 解密并解析智能机器人 API 模式回调消息.
+ *
+ * @param msgSignature 回调 URL 参数中的签名
+ * @param timestamp 回调 URL 参数中的时间戳
+ * @param nonce 回调 URL 参数中的随机串
+ * @param encryptedJson 回调 JSON 信封中的 encrypt 字段
+ * @param token 机器人后台配置的 Token
+ * @param encodingAesKey 机器人后台配置的 EncodingAESKey
+ * @param aiBotId 机器人 ID
+ * @return 解密并解析后的回调消息
+ */
+ default WxCpIntelligentRobotMessage parseEncryptedCallbackMessage(String msgSignature, String timestamp, String nonce,
+ String encryptedJson, String token, String encodingAesKey,
+ String aiBotId) {
+ throw new UnsupportedOperationException("当前智能机器人服务不支持 API 模式回调解析");
+ }
+
+ /**
+ * 加密并向智能机器人 API 模式的临时 response_url 回复消息.
+ *
+ * @param responseUrl 回调消息中的 response_url
+ * @param plainJson 回复的明文 JSON
+ * @param token 机器人后台配置的 Token
+ * @param encodingAesKey 机器人后台配置的 EncodingAESKey
+ * @param aiBotId 机器人 ID
+ * @param timestamp 回复时间戳
+ * @param nonce 回复随机串
+ * @return 企业微信响应内容
+ * @throws WxErrorException 微信接口异常
+ */
+ default String replyMessage(String responseUrl, String plainJson, String token, String encodingAesKey, String aiBotId,
+ String timestamp, String nonce) throws WxErrorException {
+ throw new UnsupportedOperationException("当前智能机器人服务不支持 API 模式消息回复");
+ }
+
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpKfService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpKfService.java
index 046cfbc5bb..850ffaae5a 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpKfService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpKfService.java
@@ -291,4 +291,81 @@ WxCpBaseResp upgradeGroupchatService(String openKfid, String externalUserId,
*/
WxCpBaseResp cancelUpgradeService(String openKfid, String externalUserId)
throws WxErrorException;
+
+ /**
+ * 添加知识库分组。
+ *
+ * @param group 分组信息
+ * @return 新增结果，包含分组 ID
+ * @throws WxErrorException 异常
+ */
+ WxCpKfKnowledgeGroupAddResp addKnowledgeGroup(WxCpKfKnowledgeGroup group) throws WxErrorException;
+
+ /**
+ * 删除知识库分组。
+ *
+ * @param groupId 分组 ID
+ * @return 接口返回结果
+ * @throws WxErrorException 异常
+ */
+ WxCpBaseResp delKnowledgeGroup(String groupId) throws WxErrorException;
+
+ /**
+ * 修改知识库分组。
+ *
+ * @param group 分组信息，必须包含分组 ID 和名称
+ * @return 接口返回结果
+ * @throws WxErrorException 异常
+ */
+ WxCpBaseResp modKnowledgeGroup(WxCpKfKnowledgeGroup group) throws WxErrorException;
+
+ /**
+ * 分页获取知识库分组。
+ *
+ * @param cursor 分页游标，可为空
+ * @param limit 每页数量，可为空
+ * @param groupId 指定分组 ID，可为空
+ * @return 分组列表
+ * @throws WxErrorException 异常
+ */
+ WxCpKfKnowledgeGroupListResp listKnowledgeGroup(String cursor, Integer limit, String groupId) throws WxErrorException;
+
+ /**
+ * 添加知识库问答。
+ *
+ * @param intent 问答信息
+ * @return 新增结果，包含问答 ID
+ * @throws WxErrorException 异常
+ */
+ WxCpKfKnowledgeIntentAddResp addKnowledgeIntent(WxCpKfKnowledgeIntent intent) throws WxErrorException;
+
+ /**
+ * 删除知识库问答。
+ *
+ * @param intentId 问答 ID
+ * @return 接口返回结果
+ * @throws WxErrorException 异常
+ */
+ WxCpBaseResp delKnowledgeIntent(String intentId) throws WxErrorException;
+
+ /**
+ * 修改知识库问答。
+ *
+ * @param intent 问答信息，必须包含问答 ID
+ * @return 接口返回结果
+ * @throws WxErrorException 异常
+ */
+ WxCpBaseResp modKnowledgeIntent(WxCpKfKnowledgeIntent intent) throws WxErrorException;
+
+ /**
+ * 分页获取知识库问答。
+ *
+ * @param cursor 分页游标，可为空
+ * @param limit 每页数量，可为空
+ * @param groupId 指定分组 ID，可为空
+ * @param intentId 指定问答 ID，可为空
+ * @return 问答列表
+ * @throws WxErrorException 异常
+ */
+ WxCpKfKnowledgeIntentListResp listKnowledgeIntent(String cursor, Integer limit, String groupId, String intentId) throws WxErrorException;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMenuService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMenuService.java
index 07f300dd14..bfa2c1c938 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMenuService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMenuService.java
@@ -40,7 +40,7 @@ public interface WxCpMenuService {
* @throws WxErrorException the wx error exception
* @see #create(me.chanjar.weixin.common.bean.menu.WxMenu) #create(me.chanjar.weixin.common.bean.menu.WxMenu)
*/
- void create(Integer agentId, WxMenu menu) throws WxErrorException;
+ void create(Long agentId, WxMenu menu) throws WxErrorException;
/**
*
@@ -67,7 +67,7 @@ public interface WxCpMenuService {
* @throws WxErrorException the wx error exception
* @see #delete() #delete()
*/
- void delete(Integer agentId) throws WxErrorException;
+ void delete(Long agentId) throws WxErrorException;
/**
*
@@ -96,5 +96,5 @@ public interface WxCpMenuService {
* @throws WxErrorException the wx error exception
* @see #get() #get()
*/
- WxMenu get(Integer agentId) throws WxErrorException;
+ WxMenu get(Long agentId) throws WxErrorException;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpOAuth2Service.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpOAuth2Service.java
index 1824196720..695534ba73 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpOAuth2Service.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpOAuth2Service.java
@@ -85,7 +85,7 @@ public interface WxCpOAuth2Service {
* @throws WxErrorException 异常
* @see #getUserInfo(String) #getUserInfo(String)
*/
- WxCpOauth2UserInfo getUserInfo(Integer agentId, String code) throws WxErrorException;
+ WxCpOauth2UserInfo getUserInfo(Long agentId, String code) throws WxErrorException;
/**
* 获取家校访问用户身份
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
index 269a69a475..9a715c1e91 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
@@ -673,4 +673,11 @@ public interface WxCpService extends WxService {
* @return 人事助手服务 hr service
*/
WxCpHrService getHrService();
+
+ /**
+ * 获取待办服务
+ *
+ * @return 待办服务 todo service
+ */
+ WxCpTodoService getTodoService();
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTodoService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTodoService.java
new file mode 100644
index 0000000000..82f17c2303
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTodoService.java
@@ -0,0 +1,47 @@
+package me.chanjar.weixin.cp.api;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.cp.bean.todo.WxCpTodo;
+
+import java.util.List;
+
+/**
+ * 企业微信待办接口.
+ *
+ * 官方文档：
+ * 获取待办详情，
+ * 更新待办状态
+ *
+ * @author Binary Wang created on 2026-08-11
+ */
+public interface WxCpTodoService {
+ /**
+ * 获取待办详情.
+ *
+ * 该接口用于获取指定的待办详情，请求参数仅包含必填的 todo_id，响应直接返回单个待办对象。
+ *
+ * 请求方式： POST（HTTPS）
+ * 请求地址： https://qyapi.weixin.qq.com/cgi-bin/todo/get?access_token=ACCESS_TOKEN
+ *
+ * @param todoId 待办ID
+ * @return 待办详情 wx cp todo
+ * @throws WxErrorException the wx error exception
+ */
+ WxCpTodo get(String todoId) throws WxErrorException;
+
+ /**
+ * 更新待办状态.
+ *
+ * 该接口用于修改指定的待办信息，支持修改待办整体状态（status 字段）、待办参与人及其状态（attendees[].userid / status 字段）。
+ * 仅允许修改当前应用创建的待办，不允许修改已删除的待办。
+ *
+ * 请求方式： POST（HTTPS）
+ * 请求地址： https://qyapi.weixin.qq.com/cgi-bin/todo/update?access_token=ACCESS_TOKEN
+ *
+ * @param todoId 待办ID
+ * @param status 待办整体状态，可不传：0 - 完成；1 - 进行中。为 null 时不修改整体状态
+ * @param attendees 待办参与人列表，最多支持20个参与人。为 null 或空时不修改参与人列表
+ * @throws WxErrorException the wx error exception
+ */
+ void update(String todoId, Integer status, List attendees) throws WxErrorException;
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImpl.java
index a3ec703ca4..eb8abd773f 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImpl.java
@@ -77,6 +77,7 @@ public abstract class BaseWxCpServiceImpl implements WxCpService, RequestH
private final WxCpCorpGroupService corpGroupService = new WxCpCorpGroupServiceImpl(this);
private final WxCpIntelligentRobotService intelligentRobotService = new WxCpIntelligentRobotServiceImpl(this);
private final WxCpHrService hrService = new WxCpHrServiceImpl(this);
+ private final WxCpTodoService todoService = new WxCpTodoServiceImpl(this);
/**
* 全局的是否正在刷新access token的锁.
@@ -429,23 +430,29 @@ protected T executeInternal(RequestExecutor executor, String uri, E
* 普通请求，不自动带accessToken
*/
private T executeNormal(RequestExecutor executor, String uri, E data) throws WxErrorException {
+ String uriForLog = redactQueryString(uri);
try {
T result = executor.execute(uri, data, WxType.CP);
- log.debug("\n【请求地址】: {}\n【请求参数】：{}\n【响应数据】：{}", uri, data, result);
+ log.debug("\n【请求地址】: {}\n【请求参数】：{}\n【响应数据】：{}", uriForLog, data, result);
return result;
} catch (WxErrorException e) {
WxError error = e.getError();
if (error.getErrorCode() != 0) {
- log.error("\n【请求地址】: {}\n【请求参数】：{}\n【错误信息】：{}", uri, data, error);
+ log.error("\n【请求地址】: {}\n【请求参数】：{}\n【错误信息】：{}", uriForLog, data, error);
throw new WxErrorException(error, e);
}
return null;
} catch (IOException e) {
- log.error("\n【请求地址】: {}\n【请求参数】：{}\n【异常信息】：{}", uri, data, e.getMessage());
+ log.error("\n【请求地址】: {}\n【请求参数】：{}\n【异常信息】：{}", uriForLog, data, e.getMessage());
throw new WxErrorException(e);
}
}
+ static String redactQueryString(String uri) {
+ int queryStart = uri.indexOf('?');
+ return queryStart < 0 ? uri : uri.substring(0, queryStart) + "?******";
+ }
+
@Override
public void setWxCpConfigStorage(WxCpConfigStorage wxConfigProvider) {
this.configStorage = wxConfigProvider;
@@ -753,4 +760,9 @@ public WxCpIntelligentRobotService getIntelligentRobotService() {
public WxCpHrService getHrService() {
return this.hrService;
}
+
+ @Override
+ public WxCpTodoService getTodoService() {
+ return this.todoService;
+ }
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImpl.java
index cc08d33bb1..6f2ade2e49 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImpl.java
@@ -34,7 +34,7 @@ public class WxCpAgentServiceImpl implements WxCpAgentService {
private final WxCpService mainService;
@Override
- public WxCpAgent get(Integer agentId) throws WxErrorException {
+ public WxCpAgent get(Long agentId) throws WxErrorException {
if (agentId == null) {
throw new IllegalArgumentException("缺少agentid参数");
}
@@ -67,7 +67,7 @@ public List list() throws WxErrorException {
}
@Override
- public WxCpTpAdmin getAdminList(Integer agentId) throws WxErrorException {
+ public WxCpTpAdmin getAdminList(Long agentId) throws WxErrorException {
if (agentId == null) {
throw new IllegalArgumentException("缺少agentid参数");
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpCorpGroupServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpCorpGroupServiceImpl.java
index e3dc1cbe1c..73d11cc15d 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpCorpGroupServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpCorpGroupServiceImpl.java
@@ -25,7 +25,7 @@ public class WxCpCorpGroupServiceImpl implements WxCpCorpGroupService {
private final WxCpService cpService;
@Override
- public List listAppShareInfo(Integer agentId, Integer businessType, String corpId,
+ public List listAppShareInfo(Long agentId, Integer businessType, String corpId,
Integer limit, String cursor) throws WxErrorException {
final String url = this.cpService.getWxCpConfigStorage().getApiUrl(LIST_SHARE_APP_INFO);
JsonObject jsonObject = new JsonObject();
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpIntelligentRobotServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpIntelligentRobotServiceImpl.java
index aba1ee85c4..a5ccdca5e1 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpIntelligentRobotServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpIntelligentRobotServiceImpl.java
@@ -6,6 +6,7 @@
import me.chanjar.weixin.cp.api.WxCpIntelligentRobotService;
import me.chanjar.weixin.cp.api.WxCpService;
import me.chanjar.weixin.cp.bean.intelligentrobot.*;
+import me.chanjar.weixin.cp.util.crypto.WxCpIntelligentRobotCryptUtil;
import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.IntelligentRobot.*;
@@ -72,4 +73,19 @@ public WxCpIntelligentRobotMessage parseCallbackMessage(String callbackMessageJs
return WxCpIntelligentRobotMessage.fromJson(callbackMessageJson);
}
+ @Override
+ public WxCpIntelligentRobotMessage parseEncryptedCallbackMessage(String msgSignature, String timestamp, String nonce,
+ String encryptedJson, String token,
+ String encodingAesKey, String aiBotId) {
+ WxCpIntelligentRobotCryptUtil cryptUtil = new WxCpIntelligentRobotCryptUtil(token, encodingAesKey, aiBotId);
+ return parseCallbackMessage(cryptUtil.decrypt(msgSignature, timestamp, nonce, encryptedJson));
+ }
+
+ @Override
+ public String replyMessage(String responseUrl, String plainJson, String token, String encodingAesKey,
+ String aiBotId, String timestamp, String nonce) throws WxErrorException {
+ WxCpIntelligentRobotCryptUtil cryptUtil = new WxCpIntelligentRobotCryptUtil(token, encodingAesKey, aiBotId);
+ return this.cpService.postWithoutToken(responseUrl, cryptUtil.encrypt(plainJson, timestamp, nonce));
+ }
+
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpKfServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpKfServiceImpl.java
index be4f2a5850..be6c61ea92 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpKfServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpKfServiceImpl.java
@@ -317,4 +317,81 @@ public WxCpKfGetServicerStatisticResp getServicerStatistic(WxCpKfGetServicerStat
return WxCpKfGetServicerStatisticResp.fromJson(responseContent);
}
+ @Override
+ public WxCpKfKnowledgeGroupAddResp addKnowledgeGroup(WxCpKfKnowledgeGroup group) throws WxErrorException {
+ String url = cpService.getWxCpConfigStorage().getApiUrl(KNOWLEDGE_ADD_GROUP);
+ String responseContent = cpService.post(url, GSON.toJson(group));
+ return WxCpKfKnowledgeGroupAddResp.fromJson(responseContent);
+ }
+
+ @Override
+ public WxCpBaseResp delKnowledgeGroup(String groupId) throws WxErrorException {
+ return knowledgeBaseResp(KNOWLEDGE_DEL_GROUP, "group_id", groupId);
+ }
+
+ @Override
+ public WxCpBaseResp modKnowledgeGroup(WxCpKfKnowledgeGroup group) throws WxErrorException {
+ String url = cpService.getWxCpConfigStorage().getApiUrl(KNOWLEDGE_MOD_GROUP);
+ String responseContent = cpService.post(url, GSON.toJson(group));
+ return WxCpBaseResp.fromJson(responseContent);
+ }
+
+ @Override
+ public WxCpKfKnowledgeGroupListResp listKnowledgeGroup(String cursor, Integer limit, String groupId) throws WxErrorException {
+ String url = cpService.getWxCpConfigStorage().getApiUrl(KNOWLEDGE_LIST_GROUP);
+ String responseContent = cpService.post(url, GSON.toJson(listKnowledgeJson(cursor, limit, groupId, null)));
+ return WxCpKfKnowledgeGroupListResp.fromJson(responseContent);
+ }
+
+ @Override
+ public WxCpKfKnowledgeIntentAddResp addKnowledgeIntent(WxCpKfKnowledgeIntent intent) throws WxErrorException {
+ String url = cpService.getWxCpConfigStorage().getApiUrl(KNOWLEDGE_ADD_INTENT);
+ String responseContent = cpService.post(url, GSON.toJson(intent));
+ return WxCpKfKnowledgeIntentAddResp.fromJson(responseContent);
+ }
+
+ @Override
+ public WxCpBaseResp delKnowledgeIntent(String intentId) throws WxErrorException {
+ return knowledgeBaseResp(KNOWLEDGE_DEL_INTENT, "intent_id", intentId);
+ }
+
+ @Override
+ public WxCpBaseResp modKnowledgeIntent(WxCpKfKnowledgeIntent intent) throws WxErrorException {
+ String url = cpService.getWxCpConfigStorage().getApiUrl(KNOWLEDGE_MOD_INTENT);
+ String responseContent = cpService.post(url, GSON.toJson(intent));
+ return WxCpBaseResp.fromJson(responseContent);
+ }
+
+ @Override
+ public WxCpKfKnowledgeIntentListResp listKnowledgeIntent(String cursor, Integer limit, String groupId, String intentId) throws WxErrorException {
+ String url = cpService.getWxCpConfigStorage().getApiUrl(KNOWLEDGE_LIST_INTENT);
+ String responseContent = cpService.post(url, GSON.toJson(listKnowledgeJson(cursor, limit, groupId, intentId)));
+ return WxCpKfKnowledgeIntentListResp.fromJson(responseContent);
+ }
+
+ private WxCpBaseResp knowledgeBaseResp(String apiPath, String key, String value) throws WxErrorException {
+ String url = cpService.getWxCpConfigStorage().getApiUrl(apiPath);
+ JsonObject json = new JsonObject();
+ json.addProperty(key, value);
+ String responseContent = cpService.post(url, GSON.toJson(json));
+ return WxCpBaseResp.fromJson(responseContent);
+ }
+
+ private JsonObject listKnowledgeJson(String cursor, Integer limit, String groupId, String intentId) {
+ JsonObject json = new JsonObject();
+ if (cursor != null) {
+ json.addProperty("cursor", cursor);
+ }
+ if (limit != null) {
+ json.addProperty("limit", limit);
+ }
+ if (groupId != null) {
+ json.addProperty("group_id", groupId);
+ }
+ if (intentId != null) {
+ json.addProperty("intent_id", intentId);
+ }
+ return json;
+ }
+
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMenuServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMenuServiceImpl.java
index d008e77083..0920c2b3e0 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMenuServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMenuServiceImpl.java
@@ -27,7 +27,7 @@ public void create(WxMenu menu) throws WxErrorException {
}
@Override
- public void create(Integer agentId, WxMenu menu) throws WxErrorException {
+ public void create(Long agentId, WxMenu menu) throws WxErrorException {
String url = String.format(this.mainService.getWxCpConfigStorage().getApiUrl(MENU_CREATE), agentId);
this.mainService.post(url, menu.toJson());
}
@@ -38,7 +38,7 @@ public void delete() throws WxErrorException {
}
@Override
- public void delete(Integer agentId) throws WxErrorException {
+ public void delete(Long agentId) throws WxErrorException {
String url = String.format(this.mainService.getWxCpConfigStorage().getApiUrl(MENU_DELETE), agentId);
this.mainService.get(url, null);
}
@@ -49,7 +49,7 @@ public WxMenu get() throws WxErrorException {
}
@Override
- public WxMenu get(Integer agentId) throws WxErrorException {
+ public WxMenu get(Long agentId) throws WxErrorException {
String url = String.format(this.mainService.getWxCpConfigStorage().getApiUrl(MENU_GET), agentId);
try {
String resultContent = this.mainService.get(url, null);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMessageServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMessageServiceImpl.java
index 6daea8ef2f..def73e4152 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMessageServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMessageServiceImpl.java
@@ -21,7 +21,7 @@ public class WxCpMessageServiceImpl implements WxCpMessageService {
@Override
public WxCpMessageSendResult send(WxCpMessage message) throws WxErrorException {
- Integer agentId = message.getAgentId();
+ Long agentId = message.getAgentId();
if (null == agentId) {
message.setAgentId(this.cpService.getWxCpConfigStorage().getAgentId());
}
@@ -38,7 +38,7 @@ public WxCpMessageSendStatistics getStatistics(int timeType) throws WxErrorExcep
@Override
public WxCpLinkedCorpMessageSendResult sendLinkedCorpMessage(WxCpLinkedCorpMessage message) throws WxErrorException {
- Integer agentId = message.getAgentId();
+ Long agentId = message.getAgentId();
if (null == agentId) {
message.setAgentId(this.cpService.getWxCpConfigStorage().getAgentId());
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpOAuth2ServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpOAuth2ServiceImpl.java
index d04a051c0e..9b390b5ec8 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpOAuth2ServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpOAuth2ServiceImpl.java
@@ -69,7 +69,7 @@ public WxCpOauth2UserInfo getUserInfo(String code) throws WxErrorException {
}
@Override
- public WxCpOauth2UserInfo getUserInfo(Integer agentId, String code) throws WxErrorException {
+ public WxCpOauth2UserInfo getUserInfo(Long agentId, String code) throws WxErrorException {
String responseText =
this.mainService.get(String.format(this.mainService.getWxCpConfigStorage().getApiUrl(GET_USER_INFO), code,
agentId), null);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpTaskCardServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpTaskCardServiceImpl.java
index 8469451428..0cf0ab6665 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpTaskCardServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpTaskCardServiceImpl.java
@@ -28,7 +28,7 @@ public class WxCpTaskCardServiceImpl implements WxCpTaskCardService {
@Override
public void update(List userIds, String taskId, String replaceName) throws WxErrorException {
- Integer agentId = this.mainService.getWxCpConfigStorage().getAgentId();
+ Long agentId = this.mainService.getWxCpConfigStorage().getAgentId();
Map data = new HashMap<>(4);
data.put("userids", userIds);
@@ -45,7 +45,7 @@ public void update(List userIds, String taskId, String replaceName) thro
public void updateTemplateCardButton(List userIds, List partyIds,
List tagIds, Integer atAll,
String responseCode, String replaceName) throws WxErrorException {
- Integer agentId = this.mainService.getWxCpConfigStorage().getAgentId();
+ Long agentId = this.mainService.getWxCpConfigStorage().getAgentId();
Map data = new HashMap<>(7);
data.put("userids", userIds);
data.put("partyids", partyIds);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpTodoServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpTodoServiceImpl.java
new file mode 100644
index 0000000000..627784b36c
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpTodoServiceImpl.java
@@ -0,0 +1,50 @@
+package me.chanjar.weixin.cp.api.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.api.WxCpTodoService;
+import me.chanjar.weixin.cp.bean.todo.WxCpTodo;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.Todo.*;
+
+/**
+ * 企业微信待办接口实现类.
+ *
+ * @author Binary Wang created on 2026-08-11
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class WxCpTodoServiceImpl implements WxCpTodoService {
+ private final WxCpService cpService;
+
+ @Override
+ public WxCpTodo get(String todoId) throws WxErrorException {
+ final Map param = new HashMap<>(1);
+ param.put("todo_id", todoId);
+ final String response = this.cpService.post(this.cpService.getWxCpConfigStorage().getApiUrl(TODO_GET),
+ WxCpGsonBuilder.create().toJson(param));
+ return WxCpGsonBuilder.create().fromJson(response, WxCpTodo.class);
+ }
+
+ @Override
+ public void update(String todoId, Integer status, List attendees) throws WxErrorException {
+ final Map param = new HashMap<>(3);
+ param.put("todo_id", todoId);
+ if (status != null) {
+ param.put("status", status);
+ }
+ if (attendees != null && !attendees.isEmpty()) {
+ param.put("attendees", attendees);
+ }
+
+ this.cpService.post(this.cpService.getWxCpConfigStorage().getApiUrl(TODO_UPDATE),
+ WxCpGsonBuilder.create().toJson(param));
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java
index 5d61b3a199..8f96a729a0 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgent.java
@@ -32,7 +32,7 @@ public class WxCpAgent implements Serializable {
private String errMsg;
@SerializedName("agentid")
- private Integer agentId;
+ private Long agentId;
@SerializedName("name")
private String name;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgentJsapiSignature.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgentJsapiSignature.java
index 4562d9b9b0..8ca7a6cb95 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgentJsapiSignature.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpAgentJsapiSignature.java
@@ -21,7 +21,7 @@ public class WxCpAgentJsapiSignature implements Serializable {
private String corpid;
- private Integer agentid;
+ private Long agentid;
private long timestamp;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/corpgroup/WxCpCorpGroupCorpGetTokenReq.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/corpgroup/WxCpCorpGroupCorpGetTokenReq.java
index 6370fc7c11..7fa00a3ada 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/corpgroup/WxCpCorpGroupCorpGetTokenReq.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/corpgroup/WxCpCorpGroupCorpGetTokenReq.java
@@ -17,5 +17,5 @@ public class WxCpCorpGroupCorpGetTokenReq implements Serializable {
@SerializedName("business_type")
private int businessType;
@SerializedName("agentid")
- private int agentId;
+ private long agentId;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeGroup.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeGroup.java
new file mode 100644
index 0000000000..5cc6c3e79c
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeGroup.java
@@ -0,0 +1,22 @@
+package me.chanjar.weixin.cp.bean.kf;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 微信客服知识库分组。
+ */
+@Data
+public class WxCpKfKnowledgeGroup implements Serializable {
+ private static final long serialVersionUID = -170690715179803477L;
+
+ @SerializedName("group_id")
+ private String groupId;
+
+ private String name;
+
+ @SerializedName("is_default")
+ private Integer isDefault;
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeGroupAddResp.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeGroupAddResp.java
new file mode 100644
index 0000000000..52bd89bdb1
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeGroupAddResp.java
@@ -0,0 +1,23 @@
+package me.chanjar.weixin.cp.bean.kf;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 微信客服知识库分组新增返回结果。
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WxCpKfKnowledgeGroupAddResp extends WxCpBaseResp {
+ private static final long serialVersionUID = 232872665454024387L;
+
+ @SerializedName("group_id")
+ private String groupId;
+
+ public static WxCpKfKnowledgeGroupAddResp fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpKfKnowledgeGroupAddResp.class);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeGroupListResp.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeGroupListResp.java
new file mode 100644
index 0000000000..bed6bfae82
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeGroupListResp.java
@@ -0,0 +1,31 @@
+package me.chanjar.weixin.cp.bean.kf;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.List;
+
+/**
+ * 微信客服知识库分组列表返回结果。
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WxCpKfKnowledgeGroupListResp extends WxCpBaseResp {
+ private static final long serialVersionUID = -8350717377843545855L;
+
+ @SerializedName("next_cursor")
+ private String nextCursor;
+
+ @SerializedName("has_more")
+ private Integer hasMore;
+
+ @SerializedName("group_list")
+ private List groupList;
+
+ public static WxCpKfKnowledgeGroupListResp fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpKfKnowledgeGroupListResp.class);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeIntent.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeIntent.java
new file mode 100644
index 0000000000..bbe569effd
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeIntent.java
@@ -0,0 +1,109 @@
+package me.chanjar.weixin.cp.bean.kf;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 微信客服知识库问答。
+ */
+@Data
+public class WxCpKfKnowledgeIntent implements Serializable {
+ private static final long serialVersionUID = -3777712166335763935L;
+
+ @SerializedName("group_id")
+ private String groupId;
+
+ @SerializedName("intent_id")
+ private String intentId;
+
+ private Question question;
+
+ @SerializedName("similar_questions")
+ private SimilarQuestions similarQuestions;
+
+ private List answers;
+
+ public static WxCpKfKnowledgeIntent fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpKfKnowledgeIntent.class);
+ }
+
+ @Data
+ public static class Question implements Serializable {
+ private static final long serialVersionUID = -1833564733770700525L;
+ private Text text;
+ @SerializedName("similar_questions")
+ private SimilarQuestions similarQuestions;
+ private List answers;
+ }
+
+ @Data
+ public static class Text implements Serializable {
+ private static final long serialVersionUID = -4775152873471313775L;
+ private String content;
+ }
+
+ @Data
+ public static class SimilarQuestions implements Serializable {
+ private static final long serialVersionUID = -3338135520171174537L;
+ private List items;
+ }
+
+ @Data
+ public static class Answer implements Serializable {
+ private static final long serialVersionUID = 482114683168970317L;
+ private Text text;
+ private List attachments;
+ }
+
+ @Data
+ public static class Attachment implements Serializable {
+ private static final long serialVersionUID = 547601649734690079L;
+ @SerializedName("msgtype")
+ private String msgType;
+ private Image image;
+ private Video video;
+ private Link link;
+ @SerializedName("miniprogram")
+ private MiniProgram miniProgram;
+ }
+
+ @Data
+ public static class Image implements Serializable {
+ private static final long serialVersionUID = -6305485241850490695L;
+ @SerializedName("media_id")
+ private String mediaId;
+ private String name;
+ }
+
+ @Data
+ public static class Video implements Serializable {
+ private static final long serialVersionUID = 4002145709503795505L;
+ @SerializedName("media_id")
+ private String mediaId;
+ private String name;
+ }
+
+ @Data
+ public static class Link implements Serializable {
+ private static final long serialVersionUID = -1844812819777892606L;
+ private String title;
+ @SerializedName("pic_url")
+ private String picUrl;
+ private String desc;
+ private String url;
+ }
+
+ @Data
+ public static class MiniProgram implements Serializable {
+ private static final long serialVersionUID = 6893025025270416975L;
+ private String title;
+ @SerializedName("thumb_media_id")
+ private String thumbMediaId;
+ private String appid;
+ private String pagepath;
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeIntentAddResp.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeIntentAddResp.java
new file mode 100644
index 0000000000..44f162e78f
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeIntentAddResp.java
@@ -0,0 +1,23 @@
+package me.chanjar.weixin.cp.bean.kf;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 微信客服知识库问答新增返回结果。
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WxCpKfKnowledgeIntentAddResp extends WxCpBaseResp {
+ private static final long serialVersionUID = -2693926545826175543L;
+
+ @SerializedName("intent_id")
+ private String intentId;
+
+ public static WxCpKfKnowledgeIntentAddResp fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpKfKnowledgeIntentAddResp.class);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeIntentListResp.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeIntentListResp.java
new file mode 100644
index 0000000000..a188a03c0d
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeIntentListResp.java
@@ -0,0 +1,31 @@
+package me.chanjar.weixin.cp.bean.kf;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import me.chanjar.weixin.cp.bean.WxCpBaseResp;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.List;
+
+/**
+ * 微信客服知识库问答列表返回结果。
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WxCpKfKnowledgeIntentListResp extends WxCpBaseResp {
+ private static final long serialVersionUID = -724770244623284115L;
+
+ @SerializedName("next_cursor")
+ private String nextCursor;
+
+ @SerializedName("has_more")
+ private Integer hasMore;
+
+ @SerializedName("intent_list")
+ private List intentList;
+
+ public static WxCpKfKnowledgeIntentListResp fromJson(String json) {
+ return WxCpGsonBuilder.create().fromJson(json, WxCpKfKnowledgeIntentListResp.class);
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpLinkedCorpMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpLinkedCorpMessage.java
index 7e777384eb..46784158f3 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpLinkedCorpMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpLinkedCorpMessage.java
@@ -55,7 +55,15 @@ public class WxCpLinkedCorpMessage implements Serializable {
/**
* 企业应用的id，整型。可在应用的设置页面查看
*/
- private Integer agentId;
+ private Long agentId;
+
+ public void setAgentId(long agentId) {
+ this.agentId = Long.valueOf(agentId);
+ }
+
+ public void setAgentId(Long agentId) {
+ this.agentId = agentId;
+ }
private String msgType;
/**
* 消息内容，最长不超过2048个字节
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java
index ca3fbceccb..c25b5208f1 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessage.java
@@ -45,7 +45,15 @@ public class WxCpMessage implements Serializable {
/**
* 企业应用的id，整型。企业内部开发，可在应用的设置页面查看；第三方服务商，可通过接口 获取企业授权信息 获取该参数值
*/
- private Integer agentId;
+ private Long agentId;
+
+ public void setAgentId(long agentId) {
+ this.agentId = Long.valueOf(agentId);
+ }
+
+ public void setAgentId(Long agentId) {
+ this.agentId = agentId;
+ }
/**
* 消息类型
* 文本消息: text
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpSchoolContactMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpSchoolContactMessage.java
index a13205cd6b..04ec5b135b 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpSchoolContactMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpSchoolContactMessage.java
@@ -74,7 +74,15 @@ public class WxCpSchoolContactMessage implements Serializable {
* 企业应用的id，整型。可在应用的设置页面查看
*/
@SerializedName("agentid")
- private Integer agentId;
+ private Long agentId;
+
+ public void setAgentId(long agentId) {
+ this.agentId = Long.valueOf(agentId);
+ }
+
+ public void setAgentId(Long agentId) {
+ this.agentId = agentId;
+ }
/**
* 消息内容，最长不超过2048个字节（支持id转译）
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java
index e7c2267018..fa0c747c16 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java
@@ -15,7 +15,7 @@ public abstract class BaseBuilder {
/**
* The Agent id.
*/
- protected Integer agentId;
+ protected Long agentId;
/**
* The To user.
*/
@@ -39,11 +39,15 @@ public abstract class BaseBuilder {
* @param agentId the agent id
* @return the t
*/
- public T agentId(Integer agentId) {
+ public T agentId(Long agentId) {
this.agentId = agentId;
return (T) this;
}
+ public T agentId(long agentId) {
+ return this.agentId(Long.valueOf(agentId));
+ }
+
/**
* To user t.
*
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/todo/WxCpTodo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/todo/WxCpTodo.java
new file mode 100644
index 0000000000..a33eb1f4c3
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/todo/WxCpTodo.java
@@ -0,0 +1,110 @@
+package me.chanjar.weixin.cp.bean.todo;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import me.chanjar.weixin.common.bean.ToJson;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 待办信息bean.
+ *
+ * 官方文档：
+ * 获取待办详情
+ *
+ * @author Binary Wang created on 2026-08-11
+ */
+@Data
+@Accessors(chain = true)
+public class WxCpTodo implements Serializable, ToJson {
+ private static final long serialVersionUID = -1L;
+
+ /**
+ * 待办ID
+ */
+ @SerializedName("todo_id")
+ private String todoId;
+ /**
+ * 待办内容
+ */
+ @SerializedName("content")
+ private String content;
+ /**
+ * 待办创建人ID
+ */
+ @SerializedName("creator")
+ private String creator;
+ /**
+ * 待办状态。
+ * 0 - 已完成
+ * 1 - 进行中
+ * 2 - 已删除
+ */
+ @SerializedName("status")
+ private Integer status;
+ /**
+ * 待办创建时间戳（整型秒数）
+ */
+ @SerializedName("create_time")
+ private Long createTime;
+ /**
+ * 待办参与人列表
+ */
+ @SerializedName("attendees")
+ private List attendees;
+ /**
+ * 待办截止时间戳（整型秒数）
+ */
+ @SerializedName("end_time")
+ private Long endTime;
+ /**
+ * 提醒列表
+ */
+ @SerializedName("reminders")
+ private List reminders;
+
+ @Override
+ public String toJson() {
+ return WxCpGsonBuilder.create().toJson(this);
+ }
+
+ /**
+ * 待办参与人.
+ */
+ @Data
+ @Accessors(chain = true)
+ public static class Attendee implements Serializable {
+ private static final long serialVersionUID = -1L;
+
+ /**
+ * 待办参与人ID
+ */
+ @SerializedName("userid")
+ private String userid;
+ /**
+ * 参与人的待办状态。
+ * 0 - 完成
+ * 1 - 进行中
+ */
+ @SerializedName("status")
+ private Integer status;
+ }
+
+ /**
+ * 待办提醒.
+ */
+ @Data
+ @Accessors(chain = true)
+ public static class Reminder implements Serializable {
+ private static final long serialVersionUID = -1L;
+
+ /**
+ * 提醒时间戳（整型秒数）
+ */
+ @SerializedName("remind_time")
+ private Long remindTime;
+ }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java
index 7f66f05094..0efe7dd606 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java
@@ -158,7 +158,7 @@ public interface WxCpConfigStorage {
*
* @return the agent id
*/
- Integer getAgentId();
+ Long getAgentId();
/**
* Gets token.
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpCorpGroupConfigStorage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpCorpGroupConfigStorage.java
index df758ac3a2..61b3b4043b 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpCorpGroupConfigStorage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpCorpGroupConfigStorage.java
@@ -36,7 +36,7 @@ public interface WxCpCorpGroupConfigStorage {
* @param corpAccessToken the corp access token
* @param expiresInSeconds the expires in seconds
*/
- void updateCorpAccessToken(String corpId, Integer agentId, String corpAccessToken, int expiresInSeconds);
+ void updateCorpAccessToken(String corpId, Long agentId, String corpAccessToken, int expiresInSeconds);
/**
* 授权企业的access token相关
@@ -45,7 +45,7 @@ public interface WxCpCorpGroupConfigStorage {
* @param agentId 应用ID
* @return the access token
*/
- String getCorpAccessToken(String corpId, Integer agentId);
+ String getCorpAccessToken(String corpId, Long agentId);
/**
* Gets access token entity.
@@ -54,7 +54,7 @@ public interface WxCpCorpGroupConfigStorage {
* @param agentId 应用ID
* @return the access token entity
*/
- WxAccessToken getCorpAccessTokenEntity(String corpId, Integer agentId);
+ WxAccessToken getCorpAccessTokenEntity(String corpId, Long agentId);
/**
* Is access token expired boolean.
@@ -63,7 +63,7 @@ public interface WxCpCorpGroupConfigStorage {
* @param agentId 应用ID
* @return the boolean
*/
- boolean isCorpAccessTokenExpired(String corpId, Integer agentId);
+ boolean isCorpAccessTokenExpired(String corpId, Long agentId);
/**
* Expire access token.
@@ -71,7 +71,7 @@ public interface WxCpCorpGroupConfigStorage {
* @param corpId 企业ID
* @param agentId 应用ID
*/
- void expireCorpAccessToken(String corpId, Integer agentId);
+ void expireCorpAccessToken(String corpId, Long agentId);
/**
* 网络代理相关
@@ -122,11 +122,11 @@ public interface WxCpCorpGroupConfigStorage {
* @param agentId 应用ID
* @return the access token lock
*/
- Lock getCorpAccessTokenLock(String corpId, Integer agentId);
+ Lock getCorpAccessTokenLock(String corpId, Long agentId);
void setCorpId(String corpId);
- void setAgentId(Integer agentId);
+ void setAgentId(Long agentId);
/**
* Gets corp id.
@@ -140,5 +140,5 @@ public interface WxCpCorpGroupConfigStorage {
*
* @return the agent id
*/
- Integer getAgentId();
+ Long getAgentId();
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/AbstractWxCpInRedisConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/AbstractWxCpInRedisConfigImpl.java
index 448d2b62dd..dd9879a42a 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/AbstractWxCpInRedisConfigImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/AbstractWxCpInRedisConfigImpl.java
@@ -74,7 +74,7 @@ public AbstractWxCpInRedisConfigImpl(@NonNull WxRedisOps redisOps, String keyPre
* @param agentId 应用 agentId
*/
@Override
- public void setAgentId(Integer agentId) {
+ public void setAgentId(Long agentId) {
super.setAgentId(agentId);
String ukey;
if (agentId != null) {
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpCorpGroupDefaultConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpCorpGroupDefaultConfigImpl.java
index b3d4834426..ac57fbeb7a 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpCorpGroupDefaultConfigImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpCorpGroupDefaultConfigImpl.java
@@ -39,7 +39,7 @@ public class WxCpCorpGroupDefaultConfigImpl implements WxCpCorpGroupConfigStorag
/**
* 微信企业号应用 ID
*/
- private volatile Integer agentId;
+ private volatile Long agentId;
@Override
public void setBaseApiUrl(String baseUrl) {
@@ -65,17 +65,17 @@ public void setCorpId(String corpId) {
}
@Override
- public Integer getAgentId() {
+ public Long getAgentId() {
return agentId;
}
@Override
- public void setAgentId(Integer agentId) {
+ public void setAgentId(Long agentId) {
this.agentId = agentId;
}
@Override
- public void updateCorpAccessToken(String corpId, Integer agentId, String corpAccessToken, int expiresInSeconds) {
+ public void updateCorpAccessToken(String corpId, Long agentId, String corpAccessToken, int expiresInSeconds) {
String key = generateAccessTokenKey(corpId, agentId);
corpAccessTokenMap.put(key, corpAccessToken);
//预留200秒的时间
@@ -83,12 +83,12 @@ public void updateCorpAccessToken(String corpId, Integer agentId, String corpAcc
}
@Override
- public String getCorpAccessToken(String corpId, Integer agentId) {
+ public String getCorpAccessToken(String corpId, Long agentId) {
return this.corpAccessTokenMap.get(generateAccessTokenKey(corpId, agentId));
}
@Override
- public WxAccessToken getCorpAccessTokenEntity(String corpId, Integer agentId) {
+ public WxAccessToken getCorpAccessTokenEntity(String corpId, Long agentId) {
String key = generateAccessTokenKey(corpId, agentId);
String accessToken = corpAccessTokenMap.getOrDefault(key, StringUtils.EMPTY);
Long expire = corpAccessTokenExpireTimeMap.getOrDefault(key, 0L);
@@ -99,7 +99,7 @@ public WxAccessToken getCorpAccessTokenEntity(String corpId, Integer agentId) {
}
@Override
- public boolean isCorpAccessTokenExpired(String corpId, Integer agentId) {
+ public boolean isCorpAccessTokenExpired(String corpId, Long agentId) {
//不存在或者过期
String key = generateAccessTokenKey(corpId, agentId);
return corpAccessTokenExpireTimeMap.get(key) == null
@@ -107,7 +107,7 @@ public boolean isCorpAccessTokenExpired(String corpId, Integer agentId) {
}
@Override
- public void expireCorpAccessToken(String corpId, Integer agentId) {
+ public void expireCorpAccessToken(String corpId, Long agentId) {
String key = generateAccessTokenKey(corpId, agentId);
corpAccessTokenMap.remove(key);
corpAccessTokenExpireTimeMap.remove(key);
@@ -189,12 +189,12 @@ public boolean autoRefreshToken() {
}
@Override
- public Lock getCorpAccessTokenLock(String corpId, Integer agentId) {
+ public Lock getCorpAccessTokenLock(String corpId, Long agentId) {
return this.corpAccessTokenLocker
.computeIfAbsent(generateAccessTokenKey(corpId, agentId), key -> new ReentrantLock());
}
- private String generateAccessTokenKey(String corpId, Integer agentId) {
+ private String generateAccessTokenKey(String corpId, Long agentId) {
return String.join(":", this.corpId, String.valueOf(this.agentId), corpId, String.valueOf(agentId));
}
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpCorpGroupRedissonConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpCorpGroupRedissonConfigImpl.java
index 1ef05ba8b3..d5b566a5e5 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpCorpGroupRedissonConfigImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpCorpGroupRedissonConfigImpl.java
@@ -60,7 +60,7 @@ public class WxCpCorpGroupRedissonConfigImpl implements WxCpCorpGroupConfigStora
/**
* 微信企业号应用 ID
*/
- private volatile Integer agentId;
+ private volatile Long agentId;
@Override
public void setBaseApiUrl(String baseUrl) {
@@ -86,27 +86,27 @@ public void setCorpId(String corpId) {
}
@Override
- public Integer getAgentId() {
+ public Long getAgentId() {
return agentId;
}
@Override
- public void setAgentId(Integer agentId) {
+ public void setAgentId(Long agentId) {
this.agentId = agentId;
}
@Override
- public void updateCorpAccessToken(String corpId, Integer agentId, String corpAccessToken, int expiresInSeconds) {
+ public void updateCorpAccessToken(String corpId, Long agentId, String corpAccessToken, int expiresInSeconds) {
wxRedisOps.setValue(generateAccessTokenKey(corpId, agentId), corpAccessToken, expiresInSeconds, TimeUnit.SECONDS);
}
@Override
- public String getCorpAccessToken(String corpId, Integer agentId) {
+ public String getCorpAccessToken(String corpId, Long agentId) {
return wxRedisOps.getValue(generateAccessTokenKey(corpId, agentId));
}
@Override
- public WxAccessToken getCorpAccessTokenEntity(String corpId, Integer agentId) {
+ public WxAccessToken getCorpAccessTokenEntity(String corpId, Long agentId) {
String key = generateAccessTokenKey(corpId, agentId);
String accessToken = wxRedisOps.getValue(key);
Long expire = wxRedisOps.getExpire(key);
@@ -120,13 +120,13 @@ public WxAccessToken getCorpAccessTokenEntity(String corpId, Integer agentId) {
}
@Override
- public boolean isCorpAccessTokenExpired(String corpId, Integer agentId) {
+ public boolean isCorpAccessTokenExpired(String corpId, Long agentId) {
String key = generateAccessTokenKey(corpId, agentId);
return wxRedisOps.getExpire(key) == 0L || wxRedisOps.getExpire(key) == -2;
}
@Override
- public void expireCorpAccessToken(String corpId, Integer agentId) {
+ public void expireCorpAccessToken(String corpId, Long agentId) {
wxRedisOps.expire(generateAccessTokenKey(corpId, agentId), 0, TimeUnit.SECONDS);
}
@@ -206,11 +206,11 @@ public boolean autoRefreshToken() {
}
@Override
- public Lock getCorpAccessTokenLock(String corpId, Integer agentId) {
+ public Lock getCorpAccessTokenLock(String corpId, Long agentId) {
return this.getLockByKey(String.join(":", corpId, String.valueOf(agentId), LOCKER_CORP_ACCESS_TOKEN));
}
- private String generateAccessTokenKey(String corpId, Integer agentId) {
+ private String generateAccessTokenKey(String corpId, Long agentId) {
return String.join(":", keyPrefix, CG_ACCESS_TOKEN_KEY, corpId, String.valueOf(agentId));
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java
index 6435370150..484e0c4284 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java
@@ -30,7 +30,7 @@ public class WxCpDefaultConfigImpl implements WxCpConfigStorage, Serializable {
/**
* The Agent id.
*/
- protected volatile Integer agentId;
+ protected volatile Long agentId;
/**
* The Jsapi ticket lock.
*/
@@ -320,7 +320,7 @@ public void setAesKey(String aesKey) {
}
@Override
- public Integer getAgentId() {
+ public Long getAgentId() {
return this.agentId;
}
@@ -329,10 +329,14 @@ public Integer getAgentId() {
*
* @param agentId the agent id
*/
- public void setAgentId(Integer agentId) {
+ public void setAgentId(Long agentId) {
this.agentId = agentId;
}
+ public void setAgentId(long agentId) {
+ this.setAgentId(Long.valueOf(agentId));
+ }
+
/**
* 设置企微会话存档路径.
*
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java
index 85d136e01d..a013a9b930 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java
@@ -40,7 +40,7 @@ public class WxCpRedisConfigImpl implements WxCpConfigStorage {
private volatile String corpSecret;
private volatile String token;
private volatile String aesKey;
- private volatile Integer agentId;
+ private volatile Long agentId;
private volatile String msgAuditPriKey;
private volatile String msgAuditLibPath;
private volatile String oauth2redirectUri;
@@ -312,7 +312,7 @@ public void setCorpSecret(String corpSecret) {
}
@Override
- public Integer getAgentId() {
+ public Long getAgentId() {
return this.agentId;
}
@@ -321,7 +321,7 @@ public Integer getAgentId() {
*
* @param agentId the agent id
*/
- public void setAgentId(Integer agentId) {
+ public void setAgentId(Long agentId) {
this.agentId = agentId;
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
index 642e579870..bb180cc40a 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
@@ -1719,6 +1719,23 @@ interface Kf {
*/
String CUSTOMER_CANCEL_UPGRADE_SERVICE = "/cgi-bin/kf/customer/cancel_upgrade_service";
+ /** 添加知识库分组。 */
+ String KNOWLEDGE_ADD_GROUP = "/cgi-bin/kf/knowledge/add_group";
+ /** 删除知识库分组。 */
+ String KNOWLEDGE_DEL_GROUP = "/cgi-bin/kf/knowledge/del_group";
+ /** 修改知识库分组。 */
+ String KNOWLEDGE_MOD_GROUP = "/cgi-bin/kf/knowledge/mod_group";
+ /** 获取知识库分组列表。 */
+ String KNOWLEDGE_LIST_GROUP = "/cgi-bin/kf/knowledge/list_group";
+ /** 添加知识库问答。 */
+ String KNOWLEDGE_ADD_INTENT = "/cgi-bin/kf/knowledge/add_intent";
+ /** 删除知识库问答。 */
+ String KNOWLEDGE_DEL_INTENT = "/cgi-bin/kf/knowledge/del_intent";
+ /** 修改知识库问答。 */
+ String KNOWLEDGE_MOD_INTENT = "/cgi-bin/kf/knowledge/mod_intent";
+ /** 获取知识库问答列表。 */
+ String KNOWLEDGE_LIST_INTENT = "/cgi-bin/kf/knowledge/list_intent";
+
}
/**
@@ -1884,4 +1901,22 @@ interface Hr {
*/
String UPDATE_EMPLOYEE_FIELD_INFO = "/cgi-bin/hr/update_staff_info";
}
+
+ /**
+ * 待办相关接口.
+ * 官方文档：https://developer.work.weixin.qq.com/document/path/101524
+ */
+ interface Todo {
+ /**
+ * 获取待办详情
+ * https://developer.work.weixin.qq.com/document/path/101524
+ */
+ String TODO_GET = "/cgi-bin/todo/get";
+
+ /**
+ * 更新待办状态
+ * https://developer.work.weixin.qq.com/document/path/101534
+ */
+ String TODO_UPDATE = "/cgi-bin/todo/update";
+ }
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/corpgroup/service/WxCpCgService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/corpgroup/service/WxCpCgService.java
index f94c14a4f1..a8d0de682e 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/corpgroup/service/WxCpCgService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/corpgroup/service/WxCpCgService.java
@@ -24,11 +24,11 @@ public interface WxCpCgService {
* @param corpAccessToken the corp access token
* @param expiresInSeconds the expires in seconds
*/
- void updateCorpAccessToken(String corpId, Integer agentId, String corpAccessToken, int expiresInSeconds);
+ void updateCorpAccessToken(String corpId, Long agentId, String corpAccessToken, int expiresInSeconds);
- String getCorpAccessToken(String corpId, Integer agentId, Integer businessType) throws WxErrorException;
+ String getCorpAccessToken(String corpId, Long agentId, Integer businessType) throws WxErrorException;
- String getCorpAccessToken(String corpId, Integer agentId, Integer businessType, boolean forceRefresh) throws WxErrorException;
+ String getCorpAccessToken(String corpId, Long agentId, Integer businessType, boolean forceRefresh) throws WxErrorException;
/**
* 授权企业的access token相关
@@ -39,7 +39,7 @@ public interface WxCpCgService {
* @return the access token
* @throws WxErrorException 微信错误异常
*/
- WxAccessToken getCorpAccessTokenEntity(String corpId, Integer agentId, Integer businessType) throws WxErrorException;
+ WxAccessToken getCorpAccessTokenEntity(String corpId, Long agentId, Integer businessType) throws WxErrorException;
/**
* Gets access token entity.
@@ -51,7 +51,7 @@ public interface WxCpCgService {
* @return the access token entity
* @throws WxErrorException 微信错误异常
*/
- WxAccessToken getCorpAccessTokenEntity(String corpId, Integer agentId, Integer businessType, boolean forceRefresh) throws WxErrorException;
+ WxAccessToken getCorpAccessTokenEntity(String corpId, Long agentId, Integer businessType, boolean forceRefresh) throws WxErrorException;
/**
* Is access token expired boolean.
@@ -60,7 +60,7 @@ public interface WxCpCgService {
* @param agentId 应用ID
* @return the boolean
*/
- boolean isCorpAccessTokenExpired(String corpId, Integer agentId);
+ boolean isCorpAccessTokenExpired(String corpId, Long agentId);
/**
* Expire access token.
@@ -68,7 +68,7 @@ public interface WxCpCgService {
* @param corpId 企业ID
* @param agentId 应用ID
*/
- void expireCorpAccessToken(String corpId, Integer agentId);
+ void expireCorpAccessToken(String corpId, Long agentId);
/**
* 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的GET请求.
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/corpgroup/service/impl/BaseWxCpCgServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/corpgroup/service/impl/BaseWxCpCgServiceImpl.java
index e4fe2a686a..5439849f2a 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/corpgroup/service/impl/BaseWxCpCgServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/corpgroup/service/impl/BaseWxCpCgServiceImpl.java
@@ -43,17 +43,17 @@ public abstract class BaseWxCpCgServiceImpl implements WxCpCgService, Requ
private final WxCpLinkedCorpService linkedCorpService = new WxCpLinkedCorpServiceImpl(this);
@Override
- public void updateCorpAccessToken(String corpId, Integer agentId, String corpAccessToken, int expiresInSeconds) {
+ public void updateCorpAccessToken(String corpId, Long agentId, String corpAccessToken, int expiresInSeconds) {
}
@Override
- public String getCorpAccessToken(String corpId, Integer agentId, Integer businessType) throws WxErrorException {
+ public String getCorpAccessToken(String corpId, Long agentId, Integer businessType) throws WxErrorException {
return getCorpAccessToken(corpId, agentId, businessType, false);
}
@Override
- public String getCorpAccessToken(String corpId, Integer agentId, Integer businessType, boolean forceRefresh) throws WxErrorException {
+ public String getCorpAccessToken(String corpId, Long agentId, Integer businessType, boolean forceRefresh) throws WxErrorException {
if (!this.configStorage.isCorpAccessTokenExpired(corpId, agentId) && !forceRefresh) {
return this.configStorage.getCorpAccessToken(corpId, agentId);
}
@@ -71,23 +71,23 @@ public String getCorpAccessToken(String corpId, Integer agentId, Integer busines
}
@Override
- public WxAccessToken getCorpAccessTokenEntity(String corpId, Integer agentId, Integer businessType) throws WxErrorException {
+ public WxAccessToken getCorpAccessTokenEntity(String corpId, Long agentId, Integer businessType) throws WxErrorException {
return this.getCorpAccessTokenEntity(corpId, agentId, businessType, false);
}
@Override
- public WxAccessToken getCorpAccessTokenEntity(String corpId, Integer agentId, Integer businessType, boolean forceRefresh) throws WxErrorException {
+ public WxAccessToken getCorpAccessTokenEntity(String corpId, Long agentId, Integer businessType, boolean forceRefresh) throws WxErrorException {
return this.configStorage.getCorpAccessTokenEntity(corpId, agentId);
}
@Override
- public boolean isCorpAccessTokenExpired(String corpId, Integer agentId) {
+ public boolean isCorpAccessTokenExpired(String corpId, Long agentId) {
return this.configStorage.isCorpAccessTokenExpired(corpId, agentId);
}
@Override
- public void expireCorpAccessToken(String corpId, Integer agentId) {
+ public void expireCorpAccessToken(String corpId, Long agentId) {
this.configStorage.expireCorpAccessToken(corpId, agentId);
}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/crypto/WxCpIntelligentRobotCryptUtil.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/crypto/WxCpIntelligentRobotCryptUtil.java
new file mode 100644
index 0000000000..512c3073c6
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/crypto/WxCpIntelligentRobotCryptUtil.java
@@ -0,0 +1,88 @@
+package me.chanjar.weixin.cp.util.crypto;
+
+import com.google.gson.JsonObject;
+import me.chanjar.weixin.common.util.crypto.SHA1;
+import me.chanjar.weixin.common.util.crypto.WxCryptUtil;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+import me.chanjar.weixin.common.error.WxRuntimeException;
+import org.apache.commons.codec.binary.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.UUID;
+
+/**
+ * 企业微信智能机器人 API 模式消息加解密工具.
+ *
+ * 机器人 API 模式使用机器人后台配置的 Token、EncodingAESKey 和机器人 ID，
+ * 与企业应用 access_token 无关。
+ */
+public class WxCpIntelligentRobotCryptUtil extends WxCryptUtil {
+
+ public WxCpIntelligentRobotCryptUtil(String token, String encodingAesKey, String aiBotId) {
+ super(token, encodingAesKey, aiBotId);
+ }
+
+ /**
+ * 解密机器人 API 模式的 JSON 回调消息.
+ */
+ public String decrypt(String msgSignature, String timestamp, String nonce, String encryptedContent) {
+ String signature = SHA1.gen(this.token, timestamp, nonce, encryptedContent);
+ if (!signature.equals(msgSignature)) {
+ throw new WxRuntimeException("加密消息签名校验失败");
+ }
+
+ try {
+ Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+ cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(this.aesKey, "AES"),
+ new IvParameterSpec(Arrays.copyOfRange(this.aesKey, 0, 16)));
+ byte[] bytes = me.chanjar.weixin.common.util.crypto.PKCS7Encoder.decode(
+ cipher.doFinal(Base64.decodeBase64(encryptedContent)));
+ if (bytes.length < 20) {
+ throw new WxRuntimeException("解密后数据长度异常，可能为错误的密文或EncodingAESKey");
+ }
+
+ int plainTextLength = 0;
+ for (int index = 16; index < 20; index++) {
+ plainTextLength = (plainTextLength << 8) | (bytes[index] & 0xff);
+ }
+ int plainTextEnd = 20 + plainTextLength;
+ if (plainTextLength < 0 || plainTextEnd > bytes.length) {
+ throw new WxRuntimeException("解密后数据格式非法：消息长度不正确，可能为错误的密文或EncodingAESKey");
+ }
+
+ String receiverId = new String(Arrays.copyOfRange(bytes, plainTextEnd, bytes.length), StandardCharsets.UTF_8);
+ if (!this.appidOrCorpid.equals(receiverId)) {
+ throw new WxRuntimeException("智能机器人ID不正确，请核实！");
+ }
+ return new String(Arrays.copyOfRange(bytes, 20, plainTextEnd), StandardCharsets.UTF_8);
+ } catch (WxRuntimeException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new WxRuntimeException(e);
+ }
+ }
+
+ /**
+ * 加密机器人 API 模式的 JSON 回复消息.
+ */
+ public String encrypt(String plainJson, String timestamp, String nonce) {
+ String encryptedContent = encrypt(UUID.randomUUID().toString().replace("-", "").substring(0, 16), plainJson);
+ JsonObject result = new JsonObject();
+ result.addProperty("encrypt", encryptedContent);
+ result.addProperty("msg_signature", SHA1.gen(this.token, timestamp, nonce, encryptedContent));
+ result.addProperty("timestamp", timestamp);
+ result.addProperty("nonce", nonce);
+ return WxCpGsonBuilder.create().toJson(result);
+ }
+
+ /**
+ * 解密 URL 校验请求中的 echostr.
+ */
+ public String verifyUrl(String msgSignature, String timestamp, String nonce, String echoStr) {
+ return decrypt(msgSignature, timestamp, nonce, echoStr);
+ }
+}
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplLogTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplLogTest.java
new file mode 100644
index 0000000000..2164cbeacd
--- /dev/null
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplLogTest.java
@@ -0,0 +1,19 @@
+package me.chanjar.weixin.cp.api.impl;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+public class BaseWxCpServiceImplLogTest {
+
+ @Test
+ public void redactQueryStringShouldHideTemporaryResponseUrlCredentials() {
+ assertEquals(BaseWxCpServiceImpl.redactQueryString("https://example.com/reply?token=temporary-secret&nonce=123"),
+ "https://example.com/reply?******");
+ }
+
+ @Test
+ public void redactQueryStringShouldKeepUrlWithoutQueryString() {
+ assertEquals(BaseWxCpServiceImpl.redactQueryString("https://example.com/reply"), "https://example.com/reply");
+ }
+}
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java
index bdc85afcfc..115eafd182 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpServiceImplTest.java
@@ -121,7 +121,7 @@ public WxCpConfigStorage getWxCpConfigStorage() {
return config;
}
};
- config.setAgentId(1);
+ config.setAgentId(1L);
service.setWxCpConfigStorage(config);
RequestExecutor re = mock(RequestExecutor.class);
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImplTest.java
index cbd947b925..e9004c6cf9 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpAgentServiceImplTest.java
@@ -43,7 +43,7 @@ public class WxCpAgentServiceImplTest {
*/
@Test
public void testGet() throws Exception {
- final Integer agentId = this.wxCpService.getWxCpConfigStorage().getAgentId();
+ final Long agentId = this.wxCpService.getWxCpConfigStorage().getAgentId();
WxCpAgent wxCpAgent = this.wxCpService.getAgentService().get(agentId);
assertThat(wxCpAgent.getAgentId()).isEqualTo(agentId);
@@ -60,7 +60,7 @@ public void testGet() throws Exception {
*/
@Test
public void testSet() throws WxErrorException {
- final Integer agentId = this.wxCpService.getWxCpConfigStorage().getAgentId();
+ final Long agentId = this.wxCpService.getWxCpConfigStorage().getAgentId();
this.wxCpService.getAgentService().set(WxCpAgent.builder()
.description("abcddd")
@@ -92,7 +92,7 @@ public void testList() throws WxErrorException {
*/
@Test
public void testGetAdminList() throws WxErrorException {
- final Integer agentId = this.wxCpService.getWxCpConfigStorage().getAgentId();
+ final Long agentId = this.wxCpService.getWxCpConfigStorage().getAgentId();
WxCpTpAdmin adminList = this.wxCpService.getAgentService().getAdminList(agentId);
assertThat(adminList).isNotNull();
@@ -124,7 +124,7 @@ public void testGet() throws Exception {
when(wxService.getAgentService()).thenReturn(new WxCpAgentServiceImpl(wxService));
WxCpAgentService wxAgentService = this.wxService.getAgentService();
- WxCpAgent wxCpAgent = wxAgentService.get(9);
+ WxCpAgent wxCpAgent = wxAgentService.get(9L);
assertEquals(9, wxCpAgent.getAgentId().intValue());
@@ -171,7 +171,7 @@ public void testGetAdminList() throws Exception {
when(wxService.getAgentService()).thenReturn(new WxCpAgentServiceImpl(wxService));
WxCpAgentService wxAgentService = this.wxService.getAgentService();
- WxCpTpAdmin adminList = wxAgentService.getAdminList(9);
+ WxCpTpAdmin adminList = wxAgentService.getAdminList(9L);
assertEquals(0, adminList.getErrcode().intValue());
assertEquals(2, adminList.getAdmin().size());
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpCorpGroupServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpCorpGroupServiceImplTest.java
index e78ce5c008..44928e3e74 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpCorpGroupServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpCorpGroupServiceImplTest.java
@@ -23,7 +23,7 @@ public class WxCpCorpGroupServiceImplTest {
@Test
public void testListAppShareInfo() throws WxErrorException {
- Integer agentId = wxService.getWxCpConfigStorage().getAgentId();
+ Long agentId = wxService.getWxCpConfigStorage().getAgentId();
Integer businessType = 1;
String corpId = null;
Integer limit = null;
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpIntelligentRobotApiModeServiceTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpIntelligentRobotApiModeServiceTest.java
new file mode 100644
index 0000000000..67ade67f1c
--- /dev/null
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpIntelligentRobotApiModeServiceTest.java
@@ -0,0 +1,57 @@
+package me.chanjar.weixin.cp.api.impl;
+
+import com.google.gson.JsonObject;
+import me.chanjar.weixin.common.util.json.GsonParser;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.intelligentrobot.WxCpIntelligentRobotMessage;
+import me.chanjar.weixin.cp.util.crypto.WxCpIntelligentRobotCryptUtil;
+import org.mockito.ArgumentCaptor;
+import org.testng.annotations.Test;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+
+public class WxCpIntelligentRobotApiModeServiceTest {
+ private static final String TOKEN = "test-token";
+ private static final String AES_KEY = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFA";
+ private static final String AI_BOT_ID = "bot_1";
+ private static final String TIMESTAMP = "1710000000";
+ private static final String NONCE = "test-nonce";
+
+ @Test
+ public void shouldParseEncryptedCallbackMessage() {
+ String callbackJson = "{\"msgid\":\"msg_1\",\"aibotid\":\"bot_1\",\"msgtype\":\"text\","
+ + "\"from\":{\"userid\":\"user_1\"},\"text\":{\"content\":\"hello\"}}";
+ WxCpIntelligentRobotCryptUtil cryptUtil = new WxCpIntelligentRobotCryptUtil(TOKEN, AES_KEY, AI_BOT_ID);
+ JsonObject encrypted = GsonParser.parse(cryptUtil.encrypt(callbackJson, TIMESTAMP, NONCE));
+ WxCpIntelligentRobotServiceImpl service = new WxCpIntelligentRobotServiceImpl(mock(WxCpService.class));
+
+ WxCpIntelligentRobotMessage message = service.parseEncryptedCallbackMessage(
+ encrypted.get("msg_signature").getAsString(), TIMESTAMP, NONCE, encrypted.get("encrypt").getAsString(),
+ TOKEN, AES_KEY, AI_BOT_ID);
+
+ assertEquals(message.getMsgId(), "msg_1");
+ assertEquals(message.getText().getContent(), "hello");
+ }
+
+ @Test
+ public void shouldReplyThroughResponseUrlWithoutAccessToken() throws Exception {
+ WxCpService cpService = mock(WxCpService.class);
+ when(cpService.postWithoutToken(anyString(), anyString())).thenReturn("ok");
+ WxCpIntelligentRobotServiceImpl service = new WxCpIntelligentRobotServiceImpl(cpService);
+ String responseUrl = "https://example.com/response";
+ String plainJson = "{\"msgtype\":\"text\"}";
+
+ assertEquals(service.replyMessage(responseUrl, plainJson, TOKEN, AES_KEY, AI_BOT_ID, TIMESTAMP, NONCE), "ok");
+
+ ArgumentCaptor bodyCaptor = ArgumentCaptor.forClass(String.class);
+ verify(cpService).postWithoutToken(org.mockito.ArgumentMatchers.eq(responseUrl), bodyCaptor.capture());
+ JsonObject encrypted = GsonParser.parse(bodyCaptor.getValue());
+ WxCpIntelligentRobotCryptUtil cryptUtil = new WxCpIntelligentRobotCryptUtil(TOKEN, AES_KEY, AI_BOT_ID);
+ assertEquals(cryptUtil.decrypt(encrypted.get("msg_signature").getAsString(), TIMESTAMP, NONCE,
+ encrypted.get("encrypt").getAsString()), plainJson);
+ }
+}
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpTodoServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpTodoServiceImplTest.java
new file mode 100644
index 0000000000..d8569592ef
--- /dev/null
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpTodoServiceImplTest.java
@@ -0,0 +1,76 @@
+package me.chanjar.weixin.cp.api.impl;
+
+import com.google.inject.Inject;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.cp.api.ApiTestModule;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.todo.WxCpTodo;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.util.Arrays;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * 单元测试类.
+ *
+ * @author Binary Wang created on 2026-08-11
+ */
+@Guice(modules = ApiTestModule.class)
+public class WxCpTodoServiceImplTest {
+ /**
+ * The Wx service.
+ */
+ @Inject
+ protected WxCpService wxService;
+
+ private static final String TODO_ID = "17c7d2bd9f20d652840f72f59e796AAA";
+
+ /**
+ * Test get.
+ *
+ * @throws WxErrorException the wx error exception
+ */
+ @Test
+ public void testGet() throws WxErrorException {
+ final WxCpTodo todo = this.wxService.getTodoService().get(TODO_ID);
+ assertNotNull(todo, "get() 返回的待办对象不应为 null");
+ assertEquals(todo.getTodoId(), TODO_ID, "返回的 todo_id 应与请求一致");
+ }
+
+ /**
+ * Test update status only.
+ *
+ * @throws WxErrorException the wx error exception
+ */
+ @Test
+ public void testUpdateStatusOnly() throws WxErrorException {
+ this.wxService.getTodoService().update(TODO_ID, 0, null);
+ // 更新成功后通过 get() 回查，验证整体状态确实写入
+ final WxCpTodo todo = this.wxService.getTodoService().get(TODO_ID);
+ assertNotNull(todo, "回查待办不应为 null");
+ assertEquals(todo.getStatus(), Integer.valueOf(0), "待办整体状态应为 0（完成）");
+ }
+
+ /**
+ * Test update with attendees.
+ *
+ * @throws WxErrorException the wx error exception
+ */
+ @Test
+ public void testUpdateWithAttendees() throws WxErrorException {
+ this.wxService.getTodoService().update(TODO_ID, 1,
+ Arrays.asList(
+ new WxCpTodo.Attendee().setUserid("lisi").setStatus(0),
+ new WxCpTodo.Attendee().setUserid("zhangsan").setStatus(1)
+ ));
+ // 更新成功后通过 get() 回查，验证参与人列表确实写入
+ final WxCpTodo todo = this.wxService.getTodoService().get(TODO_ID);
+ assertNotNull(todo, "回查待办不应为 null");
+ assertNotNull(todo.getAttendees(), "attendees 列表不应为 null");
+ assertEquals(todo.getAttendees().size(), 2, "参与人数量应为 2");
+ assertEquals(todo.getStatus(), Integer.valueOf(1), "待办整体状态应为 1（进行中）");
+ }
+}
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeTest.java
new file mode 100644
index 0000000000..9f8ff6fa78
--- /dev/null
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/kf/WxCpKfKnowledgeTest.java
@@ -0,0 +1,110 @@
+package me.chanjar.weixin.cp.bean.kf;
+
+import com.google.gson.JsonParser;
+import me.chanjar.weixin.cp.api.WxCpKfService;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.api.impl.WxCpKfServiceImpl;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+import org.testng.annotations.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class WxCpKfKnowledgeTest {
+
+ @Test
+ public void testKnowledgeGroupListFromJson() {
+ String json = "{\"errcode\":0,\"errmsg\":\"ok\",\"next_cursor\":\"next\",\"has_more\":1,\"group_list\":[{\"group_id\":\"group-1\",\"name\":\"默认分组\",\"is_default\":1}]}";
+
+ WxCpKfKnowledgeGroupListResp response = WxCpKfKnowledgeGroupListResp.fromJson(json);
+
+ assertThat(response.getNextCursor()).isEqualTo("next");
+ assertThat(response.getHasMore()).isEqualTo(1);
+ assertThat(response.getGroupList()).singleElement().satisfies(group -> {
+ assertThat(group.getGroupId()).isEqualTo("group-1");
+ assertThat(group.getName()).isEqualTo("默认分组");
+ assertThat(group.getIsDefault()).isEqualTo(1);
+ });
+ }
+
+ @Test
+ public void testKnowledgeIntentToJsonAndFromJson() {
+ String json = "{\"group_id\":\"group-1\",\"intent_id\":\"intent-1\",\"question\":{\"text\":{\"content\":\"主问题\"}},\"similar_questions\":{\"items\":[{\"text\":{\"content\":\"相似问题\"}}]},\"answers\":[{\"text\":{\"content\":\"回答\"},\"attachments\":[{\"msgtype\":\"image\",\"image\":{\"media_id\":\"media-1\"}}]}]}";
+
+ WxCpKfKnowledgeIntent intent = WxCpKfKnowledgeIntent.fromJson(json);
+ String serialized = WxCpGsonBuilder.create().toJson(intent);
+
+ assertThat(intent.getQuestion().getText().getContent()).isEqualTo("主问题");
+ assertThat(intent.getSimilarQuestions().getItems()).hasSize(1);
+ assertThat(intent.getAnswers().get(0).getAttachments().get(0).getImage().getMediaId()).isEqualTo("media-1");
+ assertThat(JsonParser.parseString(serialized)).isEqualTo(JsonParser.parseString(json));
+ }
+
+ @Test
+ public void testKnowledgeIntentListFromJson() {
+ String json = "{\"errcode\":0,\"errmsg\":\"ok\",\"intent_list\":[{\"group_id\":\"group-1\",\"intent_id\":\"intent-1\",\"question\":{\"text\":{\"content\":\"主问题\"},\"similar_questions\":{\"items\":[{\"text\":{\"content\":\"相似问题\"}}]},\"answers\":[{\"text\":{\"content\":\"回答\"}}]}}]}";
+
+ WxCpKfKnowledgeIntentListResp response = WxCpKfKnowledgeIntentListResp.fromJson(json);
+ WxCpKfKnowledgeIntent intent = response.getIntentList().get(0);
+
+ assertThat(intent.getQuestion().getSimilarQuestions().getItems()).hasSize(1);
+ assertThat(intent.getQuestion().getAnswers()).singleElement().satisfies(answer ->
+ assertThat(answer.getText().getContent()).isEqualTo("回答"));
+ }
+
+ @Test
+ public void testKnowledgeApiRequests() throws Exception {
+ WxCpService cpService = mock(WxCpService.class, RETURNS_DEEP_STUBS);
+ when(cpService.getWxCpConfigStorage().getApiUrl(anyString())).thenAnswer(invocation -> invocation.getArgument(0));
+ when(cpService.post(anyString(), anyString())).thenReturn("{\"errcode\":0,\"errmsg\":\"ok\",\"group_id\":\"group-1\",\"intent_id\":\"intent-1\"}");
+ WxCpKfService service = new WxCpKfServiceImpl(cpService);
+
+ WxCpKfKnowledgeGroup group = new WxCpKfKnowledgeGroup();
+ group.setName("常见问题");
+ WxCpKfKnowledgeIntent intent = WxCpKfKnowledgeIntent.fromJson("{\"group_id\":\"group-1\",\"intent_id\":\"intent-1\",\"question\":{\"text\":{\"content\":\"主问题\"}},\"answers\":[{\"text\":{\"content\":\"回答\"}}]}");
+
+ assertThat(service.addKnowledgeGroup(group).getGroupId()).isEqualTo("group-1");
+ group.setGroupId("group-1");
+ service.delKnowledgeGroup("group-1");
+ service.modKnowledgeGroup(group);
+ service.listKnowledgeGroup("cursor", 100, "group-1");
+ assertThat(service.addKnowledgeIntent(intent).getIntentId()).isEqualTo("intent-1");
+ service.delKnowledgeIntent("intent-1");
+ service.modKnowledgeIntent(intent);
+ service.listKnowledgeIntent("cursor", 100, "group-1", "intent-1");
+ service.listKnowledgeIntent(null, null, null, null);
+
+ ArgumentCaptor urlCaptor = ArgumentCaptor.forClass(String.class);
+ ArgumentCaptor requestCaptor = ArgumentCaptor.forClass(String.class);
+ verify(cpService, times(9)).post(urlCaptor.capture(), requestCaptor.capture());
+
+ assertThat(urlCaptor.getAllValues()).isEqualTo(Arrays.asList(
+ "/cgi-bin/kf/knowledge/add_group", "/cgi-bin/kf/knowledge/del_group",
+ "/cgi-bin/kf/knowledge/mod_group", "/cgi-bin/kf/knowledge/list_group",
+ "/cgi-bin/kf/knowledge/add_intent", "/cgi-bin/kf/knowledge/del_intent",
+ "/cgi-bin/kf/knowledge/mod_intent", "/cgi-bin/kf/knowledge/list_intent",
+ "/cgi-bin/kf/knowledge/list_intent"));
+ assertJsonRequests(requestCaptor.getAllValues(), Arrays.asList(
+ "{\"name\":\"常见问题\"}", "{\"group_id\":\"group-1\"}",
+ "{\"group_id\":\"group-1\",\"name\":\"常见问题\"}", "{\"cursor\":\"cursor\",\"limit\":100,\"group_id\":\"group-1\"}",
+ "{\"group_id\":\"group-1\",\"intent_id\":\"intent-1\",\"question\":{\"text\":{\"content\":\"主问题\"}},\"answers\":[{\"text\":{\"content\":\"回答\"}}]}", "{\"intent_id\":\"intent-1\"}",
+ "{\"group_id\":\"group-1\",\"intent_id\":\"intent-1\",\"question\":{\"text\":{\"content\":\"主问题\"}},\"answers\":[{\"text\":{\"content\":\"回答\"}}]}", "{\"cursor\":\"cursor\",\"limit\":100,\"group_id\":\"group-1\",\"intent_id\":\"intent-1\"}",
+ "{}"));
+ }
+
+ private void assertJsonRequests(List actual, List expected) {
+ assertThat(actual).hasSameSizeAs(expected);
+ for (int i = 0; i < actual.size(); i++) {
+ assertThat(JsonParser.parseString(actual.get(i))).isEqualTo(JsonParser.parseString(expected.get(i)));
+ }
+ }
+}
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpLinkedCorpMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpLinkedCorpMessageTest.java
index cab57e1510..e008e47720 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpLinkedCorpMessageTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpLinkedCorpMessageTest.java
@@ -27,7 +27,7 @@ public void testToJson_text() {
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
.toTags(new String[]{"tagid1", "tagid2"})
- .agentId(1)
+ .agentId(1L)
.isToAll(false)
.isSafe(false)
.content("你的快递已到，请携带工卡前往邮件中心领取。\n出发前可查看邮件中心视频实况，聪明避开排队。")
@@ -61,7 +61,7 @@ public void testToJson_image() {
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
.toTags(new String[]{"tagid1", "tagid2"})
- .agentId(1)
+ .agentId(1L)
.isToAll(false)
.isSafe(false)
.mediaId("MEDIA_ID")
@@ -94,7 +94,7 @@ public void testToJson_video() {
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
.toTags(new String[]{"tagid1", "tagid2"})
- .agentId(1)
+ .agentId(1L)
.isToAll(false)
.isSafe(false)
.mediaId("MEDIA_ID")
@@ -131,7 +131,7 @@ public void testToJson_file() {
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
.toTags(new String[]{"tagid1", "tagid2"})
- .agentId(1)
+ .agentId(1L)
.isToAll(false)
.isSafe(false)
.mediaId("1Yv-zXfHjSjU-7LH-GwtYqDGS-zz6w22KmWAT5COgP7o")
@@ -164,7 +164,7 @@ public void testToJson_textCard() {
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
.toTags(new String[]{"tagid1", "tagid2"})
- .agentId(1)
+ .agentId(1L)
.isToAll(false)
.title("领奖通知")
.description("2016年9月26日 恭喜你抽中iPhone 7一台，领奖码：xxxx**事项详情**\n" +
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpMessageTest.java
index 9d6210b460..04f22a3d80 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpMessageTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpMessageTest.java
@@ -238,7 +238,7 @@ public void TestTemplateCardBuilder_text_notice() {
WxCpMessage reply = WxCpMessage.TEMPLATECARD().toUser("OPENID")
.toParty("PartyID1 | PartyID2")
.toTag("TagID1 | TagID2")
- .agentId(1000002)
+ .agentId(1000002L)
.cardType(WxConsts.TemplateCardType.TEXT_NOTICE)
.taskId("task_id")
.sourceIconUrl("图片的url")
@@ -328,7 +328,7 @@ public void TestTemplateCardBuilder_news_notice() {
.build();
WxCpMessage reply = WxCpMessage.TEMPLATECARD().toUser("OPENID")
- .agentId(1000002)
+ .agentId(1000002L)
.cardType(WxConsts.TemplateCardType.NEWS_NOTICE)
.sourceIconUrl("图片的url")
.sourceDesc("企业微信")
@@ -395,7 +395,7 @@ public void TestTemplateCardBuilder_button_interaction() {
.build();
WxCpMessage reply = WxCpMessage.TEMPLATECARD().toUser("OPENID")
- .agentId(1000002)
+ .agentId(1000002L)
.cardType(WxConsts.TemplateCardType.BUTTON_INTERACTION)
.sourceIconUrl("图片的url")
.sourceDesc("企业微信")
@@ -444,7 +444,7 @@ public void TestTemplateCardBuilder_vote_interaction() {
.build();
WxCpMessage reply = WxCpMessage.TEMPLATECARD().toUser("OPENID")
- .agentId(1000002)
+ .agentId(1000002L)
.cardType(WxConsts.TemplateCardType.VOTE_INTERACTION)
.sourceIconUrl("图片的url")
.sourceDesc("企业微信")
@@ -510,7 +510,7 @@ public void TestTemplateCardBuilder_multiple_interaction() {
WxCpMessage reply = WxCpMessage.TEMPLATECARD().toUser("OPENID")
- .agentId(1000002)
+ .agentId(1000002L)
.cardType(WxConsts.TemplateCardType.MULTIPLE_INTERACTION)
.sourceIconUrl("图片的url")
.sourceDesc("企业微信")
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpSchoolContactMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpSchoolContactMessageTest.java
index f261827059..8fd627ec9c 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpSchoolContactMessageTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpSchoolContactMessageTest.java
@@ -109,7 +109,7 @@ public void testToJson_text() {
.toStudentUserId(new String[]{"student_userid1", "student_userid2"})
.toParty(new String[]{"partyid1", "partyid2"})
.toAll(false)
- .agentId(1)
+ .agentId(1L)
.content("你的快递已到，请携带工卡前往邮件中心领取。\n出发前可查看邮件中心视频实况，聪明避开排队。")
.enableIdTrans(false)
.enableDuplicateCheck(false)
@@ -123,7 +123,7 @@ public void testToJson_text() {
schoolContactMessage1.setToStudentUserId(new String[]{"student_userid1", "student_userid2"});
schoolContactMessage1.setToParty(new String[]{"partyid1", "partyid2"});
schoolContactMessage1.setToAll(false);
- schoolContactMessage1.setAgentId(1);
+ schoolContactMessage1.setAgentId(1L);
schoolContactMessage1.setContent("你的快递已到，请携带工卡前往邮件中心领取");
schoolContactMessage1.setEnableIdTrans(false);
schoolContactMessage1.setEnableDuplicateCheck(false);
@@ -163,7 +163,7 @@ public void testToJson_image() {
.toStudentUserId(new String[]{"student_userid1", "student_userid2"})
.toParty(new String[]{"partyid1", "partyid2"})
.toAll(false)
- .agentId(1)
+ .agentId(1L)
.mediaId("MEDIA_ID")
.build();
@@ -198,7 +198,7 @@ public void testToJson_voice() {
.toStudentUserId(new String[]{"student_userid1", "student_userid2"})
.toParty(new String[]{"partyid1", "partyid2"})
.toAll(false)
- .agentId(1)
+ .agentId(1L)
.mediaId("MEDIA_ID")
.build();
@@ -233,7 +233,7 @@ public void testToJson_video() {
.toStudentUserId(new String[]{"student_userid1", "student_userid2"})
.toParty(new String[]{"partyid1", "partyid2"})
.toAll(false)
- .agentId(1)
+ .agentId(1L)
.mediaId("MEDIA_ID")
.title("Title")
.description("Description")
@@ -272,7 +272,7 @@ public void testToJson_file() {
.toStudentUserId(new String[]{"student_userid1", "student_userid2"})
.toParty(new String[]{"partyid1", "partyid2"})
.toAll(false)
- .agentId(1)
+ .agentId(1L)
.mediaId("1Yv-zXfHjSjU-7LH-GwtYqDGS-zz6w22KmWAT5COgP7o")
.build();
@@ -307,7 +307,7 @@ public void testToJson_news() {
.toStudentUserId(new String[]{"student_userid1", "student_userid2"})
.toParty(new String[]{"partyid1", "partyid2"})
.toAll(false)
- .agentId(1)
+ .agentId(1L)
.articles(Lists.newArrayList(NewArticle.builder()
.title("中秋节礼品领取")
.description("今年中秋节公司有豪礼相送")
@@ -357,7 +357,7 @@ public void testToJson_mpnews() {
.toStudentUserId(new String[]{"student_userid1", "student_userid2"})
.toParty(new String[]{"partyid1", "partyid2"})
.toAll(false)
- .agentId(1)
+ .agentId(1L)
.mpNewsArticles(Lists.newArrayList(MpnewsArticle.newBuilder()
.title("Title")
.thumbMediaId("MEDIA_ID")
@@ -409,7 +409,7 @@ public void testToJson_miniProgram() {
.toStudentUserId(new String[]{"student_userid1", "student_userid2"})
.toParty(new String[]{"partyid1", "partyid2"})
.toAll(false)
- .agentId(1)
+ .agentId(1L)
.appId("APPID")
.title("欢迎报名夏令营")
.thumbMediaId("MEDIA_ID")
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/AbstractWxCpInRedisConfigImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/AbstractWxCpInRedisConfigImplTest.java
index 201286943e..3f96797a83 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/AbstractWxCpInRedisConfigImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/AbstractWxCpInRedisConfigImplTest.java
@@ -29,7 +29,7 @@ public void setUp() {
// 使用匿名类提供具体实现用于测试
};
config.setCorpId("testCorpId");
- config.setAgentId(1);
+ config.setAgentId(1L);
}
/**
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/DemoToStringFix.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/DemoToStringFix.java
index 48fe9a6639..1edbe6b4ca 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/DemoToStringFix.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/DemoToStringFix.java
@@ -30,7 +30,7 @@ public void expire(String key, int expire, java.util.concurrent.TimeUnit timeUni
};
config.setCorpId("demoCorpId");
- config.setAgentId(1001);
+ config.setAgentId(1001L);
System.out.println("Testing toString() method:");
try {
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImplTest.java
new file mode 100644
index 0000000000..06807137e0
--- /dev/null
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImplTest.java
@@ -0,0 +1,17 @@
+package me.chanjar.weixin.cp.config.impl;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+public class WxCpDefaultConfigImplTest {
+
+ @Test
+ public void shouldStoreAgentIdBeyondIntegerRange() {
+ WxCpDefaultConfigImpl config = new WxCpDefaultConfigImpl();
+
+ config.setAgentId(1013699173317L);
+
+ assertEquals(config.getAgentId(), Long.valueOf(1013699173317L));
+ }
+}
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/corpgroup/service/impl/WxCpCgServiceApacheHttpClientImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/corpgroup/service/impl/WxCpCgServiceApacheHttpClientImplTest.java
index 4c99dbf5ed..7fcd0b91e7 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/corpgroup/service/impl/WxCpCgServiceApacheHttpClientImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/corpgroup/service/impl/WxCpCgServiceApacheHttpClientImplTest.java
@@ -38,7 +38,7 @@ public class WxCpCgServiceApacheHttpClientImplTest {
//下游企业的corpId
String corpId = "";
//下游企业的agentId
- int agentId = 0;
+ Long agentId = 0L;
int businessType = 0;
String userId = "";
WxCpCorpGroupCorpGetTokenReq wxCpCorpGroupCorpGetTokenReq;
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpMessageServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpMessageServiceImplTest.java
index ff0a143b71..48ee6bb804 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpMessageServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/tp/service/impl/WxCpTpMessageServiceImplTest.java
@@ -77,7 +77,7 @@ public void testSendMessage() throws WxErrorException {
+ "?access_token=" + accessToken;
when(wxCpTpService.post(eq(expectedUrl), anyString(), eq(true))).thenReturn(mockResponse);
- WxCpMessage message = WxCpMessage.TEXT().toUser("zhangsan").content("hello").agentId(1).build();
+ WxCpMessage message = WxCpMessage.TEXT().toUser("zhangsan").content("hello").agentId(1L).build();
WxCpMessageSendResult result = wxCpTpMessageService.send(message, corpId);
assertNotNull(result);
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/util/crypto/WxCpIntelligentRobotCryptUtilTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/util/crypto/WxCpIntelligentRobotCryptUtilTest.java
new file mode 100644
index 0000000000..f1e6123fab
--- /dev/null
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/util/crypto/WxCpIntelligentRobotCryptUtilTest.java
@@ -0,0 +1,40 @@
+package me.chanjar.weixin.cp.util.crypto;
+
+import com.google.gson.JsonObject;
+import me.chanjar.weixin.common.util.json.GsonParser;
+import me.chanjar.weixin.common.error.WxRuntimeException;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+
+public class WxCpIntelligentRobotCryptUtilTest {
+ private static final String TOKEN = "test-token";
+ private static final String AES_KEY = "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFA";
+ private static final String AI_BOT_ID = "aibot-123";
+ private static final String TIMESTAMP = "1710000000";
+ private static final String NONCE = "test-nonce";
+
+ @Test
+ public void encryptShouldProduceDecryptableJsonEnvelope() {
+ WxCpIntelligentRobotCryptUtil cryptUtil = new WxCpIntelligentRobotCryptUtil(TOKEN, AES_KEY, AI_BOT_ID);
+ String plainJson = "{\"msgtype\":\"text\",\"text\":{\"content\":\"hello\"}}";
+
+ JsonObject encrypted = GsonParser.parse(cryptUtil.encrypt(plainJson, TIMESTAMP, NONCE));
+
+ assertEquals(encrypted.get("timestamp").getAsString(), TIMESTAMP);
+ assertEquals(encrypted.get("nonce").getAsString(), NONCE);
+ assertEquals(cryptUtil.decrypt(encrypted.get("msg_signature").getAsString(), TIMESTAMP, NONCE,
+ encrypted.get("encrypt").getAsString()), plainJson);
+ }
+
+ @Test(expectedExceptions = WxRuntimeException.class)
+ public void decryptShouldRejectMessageForAnotherRobot() {
+ String plainJson = "{\"msgtype\":\"text\"}";
+ WxCpIntelligentRobotCryptUtil source = new WxCpIntelligentRobotCryptUtil(TOKEN, AES_KEY, AI_BOT_ID);
+ JsonObject encrypted = GsonParser.parse(source.encrypt(plainJson, TIMESTAMP, NONCE));
+ WxCpIntelligentRobotCryptUtil otherRobot = new WxCpIntelligentRobotCryptUtil(TOKEN, AES_KEY, "aibot-456");
+
+ otherRobot.decrypt(encrypted.get("msg_signature").getAsString(), TIMESTAMP, NONCE,
+ encrypted.get("encrypt").getAsString());
+ }
+}
diff --git a/weixin-java-cp/src/test/resources/testng.xml b/weixin-java-cp/src/test/resources/testng.xml
index f63d3f30f5..ed49a2da0a 100644
--- a/weixin-java-cp/src/test/resources/testng.xml
+++ b/weixin-java-cp/src/test/resources/testng.xml
@@ -12,6 +12,8 @@
com.github.binarywang
wx-java
- 4.8.5.B
+ 4.8.6.B
weixin-java-miniapp
@@ -115,6 +115,7 @@
org.apache.maven.plugins
maven-surefire-plugin
+ ${maven.test.skip}
src/test/resources/testng.xml
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaSubscribeService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaSubscribeService.java
index 1dbb9f64c9..d1ecf1c833 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaSubscribeService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaSubscribeService.java
@@ -122,7 +122,7 @@ public interface WxMaSubscribeService {
* 激活与更新服务卡片
*
* 详情请见: 激活与更新服务卡片
- * 接口url格式: POST https://api.weixin.qq.com/wxa/setusernotify?access_token=ACCESS_TOKEN
+ * 接口url格式: POST https://api.weixin.qq.com/wxa/set_user_notify?access_token=ACCESS_TOKEN
*
*
* @param request 请求参数
@@ -135,7 +135,7 @@ public interface WxMaSubscribeService {
* 更新服务卡片扩展信息
*
* 详情请见: 更新服务卡片扩展信息
- * 接口url格式: POST https://api.weixin.qq.com/wxa/setusernotifyext?access_token=ACCESS_TOKEN
+ * 接口url格式: POST https://api.weixin.qq.com/wxa/set_user_notifyext?access_token=ACCESS_TOKEN
*
*
* @param request 请求参数
@@ -148,7 +148,7 @@ public interface WxMaSubscribeService {
* 查询服务卡片状态
*
* 详情请见: 查询服务卡片状态
- * 接口url格式: POST https://api.weixin.qq.com/wxa/getusernotify?access_token=ACCESS_TOKEN
+ * 接口url格式: POST https://api.weixin.qq.com/wxa/get_user_notify?access_token=ACCESS_TOKEN
*
*
* @param request 请求参数
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaUserService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaUserService.java
index bc8b69a14f..65b817f79f 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaUserService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaUserService.java
@@ -73,6 +73,19 @@ public interface WxMaUserService {
*/
WxMaPhoneNumberInfo getPhoneNumber(String code) throws WxErrorException;
+ /**
+ * 获取手机号信息，并校验手机号获取凭证与用户的绑定关系。
+ *
+ * @param code 每个code只能使用一次，code的有效期为5min。code获取方式参考手机号快速验证组件
+ * @param openid 用户openid，传入后微信服务端将校验其与code的绑定关系
+ * @return 用户手机号信息
+ * @throws WxErrorException .
+ * @apiNote 该接口用于将code换取用户手机号。
+ */
+ default WxMaPhoneNumberInfo getPhoneNumber(String code, String openid) throws WxErrorException {
+ return this.getPhoneNumber(code);
+ }
+
/**
* 获取手机号信息,基础库:2.21.2及以上或2023年8月28日起
*
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaXPayService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaXPayService.java
index 68d4dc0c97..52f3b82e66 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaXPayService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaXPayService.java
@@ -51,6 +51,18 @@ public interface WxMaXPayService {
*/
WxMaXPayCancelCurrencyPayResponse cancelCurrencyPay(WxMaXPayCancelCurrencyPayRequest request, WxMaXPaySigParams sigParams) throws WxErrorException;
+ /**
+ * 生成调起 wx.requestVirtualPayment 所需的支付参数。
+ *
+ * @param request 虚拟支付调起参数
+ * @param sigParams 签名参数对象
+ * @return 支付参数
+ */
+ default WxMaXPayRequestVirtualPaymentData createRequestVirtualPaymentData(WxMaXPayRequestVirtualPaymentRequest request,
+ WxMaXPaySigParams sigParams) {
+ return request.createPayData(sigParams);
+ }
+
/**
* 通知发货。
*
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 9d6c2c0fa6..bf69439a65 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
@@ -374,7 +374,7 @@ public WxMaApiResponse execute(
Map headers,
String data)
throws WxErrorException {
- String dataForLog = "Headers: " + headers.toString() + " Body: " + data;
+ String dataForLog = "Headers: " + headers.toString() + " Body: " + DataUtils.handleDataWithSecret(data);
return executeWithRetry(
(uriWithAccessToken) -> executor.execute(uriWithAccessToken, headers, data, WxType.MiniApp),
uri,
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaUserServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaUserServiceImpl.java
index c9c7a7b773..abbb021e8c 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaUserServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaUserServiceImpl.java
@@ -16,6 +16,7 @@
import me.chanjar.weixin.common.util.SignUtils;
import me.chanjar.weixin.common.util.json.GsonParser;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.Map;
@@ -67,8 +68,16 @@ public WxMaPhoneNumberInfo getPhoneNoInfo(String sessionKey, String encryptedDat
@Override
public WxMaPhoneNumberInfo getPhoneNumber(String code) throws WxErrorException {
+ return this.getPhoneNumber(code, null);
+ }
+
+ @Override
+ public WxMaPhoneNumberInfo getPhoneNumber(String code, String openid) throws WxErrorException {
JsonObject param = new JsonObject();
param.addProperty("code", code);
+ if (StringUtils.isNotBlank(openid)) {
+ param.addProperty("openid", openid);
+ }
String responseContent = this.service.post(GET_PHONE_NUMBER_URL, param.toString());
JsonObject response = GsonParser.parse(responseContent);
if (response.has(PHONE_INFO)) {
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java
index 6d01e58034..f81e7d37e3 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java
@@ -1,6 +1,8 @@
package cn.binarywang.wx.miniapp.bean;
+import cn.binarywang.wx.miniapp.bean.xpay.WxMaXPayGoodsInfo;
import cn.binarywang.wx.miniapp.bean.xpay.WxMaXPayTeamInfo;
+import cn.binarywang.wx.miniapp.bean.xpay.WxMaXPayWeChatPayInfo;
import cn.binarywang.wx.miniapp.config.WxMaConfig;
import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
@@ -213,6 +215,31 @@ public class WxMaMessage implements Serializable {
@XStreamAlias("SubscribeMsgSentEvent")
private WxMaSubscribeMsgEvent.SubscribeMsgSentEvent subscribeMsgSentEvent;
+ /**
+ * 商户订单号.
+ * xpay_goods_deliver_notify
+ */
+ @SerializedName("OutTradeNo")
+ @XStreamAlias("OutTradeNo")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ private String outTradeNo;
+
+ /**
+ * 微信支付信息.
+ * xpay_goods_deliver_notify
+ */
+ @SerializedName("WeChatPayInfo")
+ @XStreamAlias("WeChatPayInfo")
+ private WxMaXPayWeChatPayInfo weChatPayInfo;
+
+ /**
+ * 道具信息.
+ * xpay_goods_deliver_notify
+ */
+ @SerializedName("GoodsInfo")
+ @XStreamAlias("GoodsInfo")
+ private WxMaXPayGoodsInfo goodsInfo;
+
// 小程序基本信息
//region 小程序基本信息 infoType=notify_3rd_wxa_auth_and_icp
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayGoodsInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayGoodsInfo.java
new file mode 100644
index 0000000000..238004afde
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayGoodsInfo.java
@@ -0,0 +1,26 @@
+package cn.binarywang.wx.miniapp.bean.xpay;
+
+import com.google.gson.annotations.SerializedName;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import lombok.Data;
+import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
+
+import java.io.Serializable;
+
+/**
+ * xpay_goods_deliver_notify 推送中的道具信息。
+ */
+@Data
+public class WxMaXPayGoodsInfo implements Serializable {
+ private static final long serialVersionUID = 7495157056049312108L;
+
+ @SerializedName("ProductId")
+ @XStreamAlias("ProductId")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ private String productId;
+
+ @SerializedName("Quantity")
+ @XStreamAlias("Quantity")
+ private Integer quantity;
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayRequestVirtualPaymentData.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayRequestVirtualPaymentData.java
new file mode 100644
index 0000000000..000226f666
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayRequestVirtualPaymentData.java
@@ -0,0 +1,49 @@
+package cn.binarywang.wx.miniapp.bean.xpay;
+
+import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
+import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 调用 wx.requestVirtualPayment 所需的支付参数。
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WxMaXPayRequestVirtualPaymentData implements Serializable {
+ private static final long serialVersionUID = 7495157056049312108L;
+
+ /**
+ * 支付模式，个人主体虚拟支付固定为 short_series_goods。
+ */
+ @SerializedName("mode")
+ private String mode;
+
+ /**
+ * 下单签名原文，需与计算 paySig 和 signature 时使用的字符串完全一致。
+ */
+ @SerializedName("signData")
+ private String signData;
+
+ /**
+ * 使用 AppKey 对 requestVirtualPayment&signData 计算得到的签名。
+ */
+ @SerializedName("paySig")
+ private String paySig;
+
+ /**
+ * 使用 session_key 对 signData 计算得到的签名。
+ */
+ @SerializedName("signature")
+ private String signature;
+
+ public String toJson() {
+ return WxMaGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayRequestVirtualPaymentRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayRequestVirtualPaymentRequest.java
new file mode 100644
index 0000000000..32ca891107
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayRequestVirtualPaymentRequest.java
@@ -0,0 +1,84 @@
+package cn.binarywang.wx.miniapp.bean.xpay;
+
+import cn.binarywang.wx.miniapp.constant.WxMaConstants;
+import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
+import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 个人主体虚拟支付调起 wx.requestVirtualPayment 的签名原文参数。
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WxMaXPayRequestVirtualPaymentRequest implements Serializable {
+ private static final long serialVersionUID = 7495157056049312108L;
+
+ /**
+ * 支付应用 ID。
+ */
+ @SerializedName("offerId")
+ private String offerId;
+
+ /**
+ * 购买数量。
+ */
+ @SerializedName("buyQuantity")
+ private Integer buyQuantity;
+
+ /**
+ * 环境，个人主体虚拟支付固定为 0。
+ */
+ @SerializedName("env")
+ private Integer env;
+
+ /**
+ * 币种，个人主体虚拟支付固定为 CNY。
+ */
+ @SerializedName("currencyType")
+ private String currencyType;
+
+ /**
+ * 道具 ID。
+ */
+ @SerializedName("productId")
+ private String productId;
+
+ /**
+ * 道具单价，单位为分。
+ */
+ @SerializedName("goodsPrice")
+ private Integer goodsPrice;
+
+ /**
+ * 商户订单号，8 到 32 位且不能以下划线开头。
+ */
+ @SerializedName("outTradeNo")
+ private String outTradeNo;
+
+ /**
+ * 商户透传数据。
+ */
+ @SerializedName("attach")
+ private String attach;
+
+ public WxMaXPayRequestVirtualPaymentData createPayData(WxMaXPaySigParams sigParams) {
+ final String signData = this.toJson();
+ return WxMaXPayRequestVirtualPaymentData.builder()
+ .mode(WxMaConstants.XPayPaymentMode.GOODS)
+ .signData(signData)
+ .paySig(sigParams.calcPaySig(WxMaConstants.XPayWxApiSigUri.WXAPI, signData))
+ .signature(sigParams.calcSig(signData))
+ .build();
+ }
+
+ public String toJson() {
+ return WxMaGsonBuilder.create().toJson(this);
+ }
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayWeChatPayInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayWeChatPayInfo.java
new file mode 100644
index 0000000000..c1580b2ba4
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayWeChatPayInfo.java
@@ -0,0 +1,22 @@
+package cn.binarywang.wx.miniapp.bean.xpay;
+
+import com.google.gson.annotations.SerializedName;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import lombok.Data;
+import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
+
+import java.io.Serializable;
+
+/**
+ * xpay_goods_deliver_notify 推送中的微信支付信息。
+ */
+@Data
+public class WxMaXPayWeChatPayInfo implements Serializable {
+ private static final long serialVersionUID = 7495157056049312108L;
+
+ @SerializedName("MchOrderNo")
+ @XStreamAlias("MchOrderNo")
+ @XStreamConverter(value = XStreamCDataConverter.class)
+ private String mchOrderNo;
+}
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 1054f7df2b..e16cd982a8 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
@@ -370,13 +370,13 @@ public interface Subscribe {
String SUBSCRIBE_MSG_SEND_URL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send";
/** 激活与更新服务卡片 */
- String SERVICE_NOTIFY_SET_URL = "https://api.weixin.qq.com/wxa/setusernotify";
+ String SERVICE_NOTIFY_SET_URL = "https://api.weixin.qq.com/wxa/set_user_notify";
/** 更新服务卡片扩展信息 */
- String SERVICE_NOTIFY_SET_EXT_URL = "https://api.weixin.qq.com/wxa/setusernotifyext";
+ String SERVICE_NOTIFY_SET_EXT_URL = "https://api.weixin.qq.com/wxa/set_user_notifyext";
/** 查询服务卡片状态 */
- String SERVICE_NOTIFY_GET_URL = "https://api.weixin.qq.com/wxa/getusernotify";
+ String SERVICE_NOTIFY_GET_URL = "https://api.weixin.qq.com/wxa/get_user_notify";
}
public interface User {
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaSubscribeServiceImplUrlTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaSubscribeServiceImplUrlTest.java
new file mode 100644
index 0000000000..1b4c09d5fd
--- /dev/null
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaSubscribeServiceImplUrlTest.java
@@ -0,0 +1,55 @@
+package cn.binarywang.wx.miniapp.api.impl;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.WxMaSubscribeService;
+import cn.binarywang.wx.miniapp.bean.WxMaGetUserNotifyRequest;
+import cn.binarywang.wx.miniapp.bean.WxMaServiceNotifyExtRequest;
+import cn.binarywang.wx.miniapp.bean.WxMaServiceNotifyRequest;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.mockito.Mockito;
+import org.testng.annotations.Test;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class WxMaSubscribeServiceImplUrlTest {
+
+ @Test
+ public void setUserNotifyUsesOfficialEndpoint() throws WxErrorException {
+ WxMaService service = successService();
+
+ subscribeService(service).setUserNotify(WxMaServiceNotifyRequest.builder().build());
+
+ verify(service).post(eq("https://api.weixin.qq.com/wxa/set_user_notify"), anyString());
+ }
+
+ @Test
+ public void setUserNotifyExtUsesOfficialEndpoint() throws WxErrorException {
+ WxMaService service = successService();
+
+ subscribeService(service).setUserNotifyExt(WxMaServiceNotifyExtRequest.builder().build());
+
+ verify(service).post(eq("https://api.weixin.qq.com/wxa/set_user_notifyext"), anyString());
+ }
+
+ @Test
+ public void getUserNotifyUsesOfficialEndpoint() throws WxErrorException {
+ WxMaService service = successService();
+
+ subscribeService(service).getUserNotify(WxMaGetUserNotifyRequest.builder().build());
+
+ verify(service).post(eq("https://api.weixin.qq.com/wxa/get_user_notify"), anyString());
+ }
+
+ private WxMaSubscribeService subscribeService(WxMaService service) {
+ return new WxMaSubscribeServiceImpl(service);
+ }
+
+ private WxMaService successService() throws WxErrorException {
+ WxMaService service = Mockito.mock(WxMaService.class);
+ when(service.post(anyString(), anyString())).thenReturn("{\"errcode\":0,\"errmsg\":\"ok\"}");
+ return service;
+ }
+}
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaUserServiceImplPhoneNumberTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaUserServiceImplPhoneNumberTest.java
new file mode 100644
index 0000000000..610cd13bf8
--- /dev/null
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaUserServiceImplPhoneNumberTest.java
@@ -0,0 +1,50 @@
+package cn.binarywang.wx.miniapp.api.impl;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import com.google.gson.JsonObject;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.util.json.GsonParser;
+import org.mockito.ArgumentCaptor;
+import org.testng.annotations.Test;
+
+import static cn.binarywang.wx.miniapp.constant.WxMaApiUrlConstants.User.GET_PHONE_NUMBER_URL;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+
+/**
+ * {@link WxMaUserServiceImpl} 获取手机号接口的单元测试。
+ */
+public class WxMaUserServiceImplPhoneNumberTest {
+
+ @Test
+ public void shouldSendOpenidWhenGettingPhoneNumber() throws WxErrorException {
+ WxMaService wxMaService = mock(WxMaService.class);
+ when(wxMaService.post(anyString(), anyString())).thenReturn("{\"phone_info\":{}}");
+
+ new WxMaUserServiceImpl(wxMaService).getPhoneNumber("phone-code", "user-openid");
+
+ ArgumentCaptor requestBody = ArgumentCaptor.forClass(String.class);
+ verify(wxMaService).post(eq(GET_PHONE_NUMBER_URL), requestBody.capture());
+ JsonObject request = GsonParser.parse(requestBody.getValue());
+ assertEquals(request.get("code").getAsString(), "phone-code");
+ assertEquals(request.get("openid").getAsString(), "user-openid");
+ }
+
+ @Test
+ public void shouldIgnoreBlankOpenidWhenGettingPhoneNumber() throws WxErrorException {
+ WxMaService wxMaService = mock(WxMaService.class);
+ when(wxMaService.post(anyString(), anyString())).thenReturn("{\"phone_info\":{}}");
+
+ new WxMaUserServiceImpl(wxMaService).getPhoneNumber("phone-code", " ");
+
+ ArgumentCaptor requestBody = ArgumentCaptor.forClass(String.class);
+ verify(wxMaService).post(eq(GET_PHONE_NUMBER_URL), requestBody.capture());
+ JsonObject request = GsonParser.parse(requestBody.getValue());
+ assertFalse(request.has("openid"));
+ }
+}
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java
index 0b7060e79b..13b6d62bba 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java
@@ -397,6 +397,77 @@ private void checkXPayRefundNotifyMessage(WxMaMessage msg) {
assertEquals(teamInfo.getTeamAction(), new Integer(0));
}
+ /**
+ * 个人主体虚拟支付发货通知事件 xpay_goods_deliver_notify 测试用例（XML格式）。
+ */
+ @Test
+ public void testXPayGoodsDeliverNotifyFromXml() {
+ String xml = "\n" +
+ " 1700000000 \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " 2 \n" +
+ " \n" +
+ " 0 \n" +
+ " ";
+
+ WxMaMessage msg = WxMaMessage.fromXml(xml);
+
+ checkXPayGoodsDeliverNotifyMessage(msg);
+ }
+
+ /**
+ * 个人主体虚拟支付发货通知事件 xpay_goods_deliver_notify 测试用例（JSON格式）。
+ */
+ @Test
+ public void testXPayGoodsDeliverNotifyFromJson() {
+ String json = "{\n" +
+ " \"ToUserName\": \"gh_abcdefg\",\n" +
+ " \"FromUserName\": \"oABCDEFG\",\n" +
+ " \"CreateTime\": 1700000000,\n" +
+ " \"MsgType\": \"event\",\n" +
+ " \"Event\": \"xpay_goods_deliver_notify\",\n" +
+ " \"OpenId\": \"oABCDEFG\",\n" +
+ " \"OutTradeNo\": \"order12345\",\n" +
+ " \"WeChatPayInfo\": {\n" +
+ " \"MchOrderNo\": \"wx_order_123\"\n" +
+ " },\n" +
+ " \"GoodsInfo\": {\n" +
+ " \"ProductId\": \"product_001\",\n" +
+ " \"Quantity\": 2\n" +
+ " },\n" +
+ " \"RetryTimes\": 0\n" +
+ "}";
+
+ WxMaMessage msg = WxMaMessage.fromJson(json);
+ checkXPayGoodsDeliverNotifyMessage(msg);
+ }
+
+ private void checkXPayGoodsDeliverNotifyMessage(WxMaMessage msg) {
+ assertEquals(msg.getToUser(), "gh_abcdefg");
+ assertEquals(msg.getFromUser(), "oABCDEFG");
+ assertEquals(msg.getCreateTime(), new Integer(1700000000));
+ assertEquals(msg.getMsgType(), WxConsts.XmlMsgType.EVENT);
+ assertEquals(msg.getEvent(), WxMaConstants.XPayNotifyEvent.GOODS_DELIVER);
+ assertEquals(msg.getOpenId(), "oABCDEFG");
+ assertEquals(msg.getOutTradeNo(), "order12345");
+ assertNotNull(msg.getWeChatPayInfo());
+ assertEquals(msg.getWeChatPayInfo().getMchOrderNo(), "wx_order_123");
+ assertNotNull(msg.getGoodsInfo());
+ assertEquals(msg.getGoodsInfo().getProductId(), "product_001");
+ assertEquals(msg.getGoodsInfo().getQuantity(), new Integer(2));
+ assertEquals(msg.getRetryTimes(), new Integer(0));
+ }
+
/**
* 虚拟支付投诉推送事件 xpay_complaint_notify 测试用例（XML格式）
*/
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayRequestVirtualPaymentTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayRequestVirtualPaymentTest.java
new file mode 100644
index 0000000000..7694033860
--- /dev/null
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/xpay/WxMaXPayRequestVirtualPaymentTest.java
@@ -0,0 +1,76 @@
+package cn.binarywang.wx.miniapp.bean.xpay;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaXPayServiceImpl;
+import cn.binarywang.wx.miniapp.constant.WxMaConstants;
+import cn.binarywang.wx.miniapp.json.WxMaGsonBuilder;
+import com.google.gson.JsonObject;
+import org.testng.annotations.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.testng.Assert.assertEquals;
+
+/**
+ * 验证个人主体虚拟支付调起 wx.requestVirtualPayment 所需参数。
+ */
+public class WxMaXPayRequestVirtualPaymentTest {
+
+ @Test
+ public void testCreatePayData() {
+ WxMaXPayRequestVirtualPaymentRequest request = WxMaXPayRequestVirtualPaymentRequest.builder()
+ .offerId("1450019686")
+ .buyQuantity(1)
+ .env(0)
+ .currencyType(WxMaConstants.XPayCurrencyType.CNY)
+ .productId("product_001")
+ .goodsPrice(100)
+ .outTradeNo("order12345")
+ .attach("attach中文")
+ .build();
+ WxMaXPaySigParams sigParams = WxMaXPaySigParams.builder()
+ .appKey("app_key_123")
+ .sessionKey("session_key_123")
+ .build();
+
+ WxMaXPayRequestVirtualPaymentData payData = request.createPayData(sigParams);
+
+ assertEquals(payData.getMode(), WxMaConstants.XPayPaymentMode.GOODS);
+ assertEquals(payData.getSignData(),
+ "{\"offerId\":\"1450019686\",\"buyQuantity\":1,\"env\":0,\"currencyType\":\"CNY\","
+ + "\"productId\":\"product_001\",\"goodsPrice\":100,\"outTradeNo\":\"order12345\","
+ + "\"attach\":\"attach中文\"}");
+ assertEquals(payData.getPaySig(), "52b0abda3c933b0273d328b5c5102ee9ab9249309474ddcdf5e9ce0f80b23532");
+ assertEquals(payData.getSignature(), "602f76d9cadf36c232f7f6c1faa5fe295b0f955d188049997d0df699c0619c86");
+
+ JsonObject jsonObject = WxMaGsonBuilder.create().fromJson(payData.toJson(), JsonObject.class);
+ assertEquals(jsonObject.get("mode").getAsString(), WxMaConstants.XPayPaymentMode.GOODS);
+ assertEquals(jsonObject.get("paySig").getAsString(), payData.getPaySig());
+ assertEquals(jsonObject.get("signature").getAsString(), payData.getSignature());
+ assertEquals(jsonObject.get("signData").getAsString(), payData.getSignData());
+ }
+
+ @Test
+ public void testCreatePayDataByService() {
+ WxMaXPayRequestVirtualPaymentRequest request = WxMaXPayRequestVirtualPaymentRequest.builder()
+ .offerId("1450019686")
+ .buyQuantity(1)
+ .env(0)
+ .currencyType(WxMaConstants.XPayCurrencyType.CNY)
+ .productId("product_001")
+ .goodsPrice(100)
+ .outTradeNo("order12345")
+ .attach("attach中文")
+ .build();
+ WxMaXPaySigParams sigParams = WxMaXPaySigParams.builder()
+ .appKey("app_key_123")
+ .sessionKey("session_key_123")
+ .build();
+
+ WxMaXPayRequestVirtualPaymentData payData = new WxMaXPayServiceImpl(mock(WxMaService.class))
+ .createRequestVirtualPaymentData(request, sigParams);
+
+ assertEquals(payData.getMode(), WxMaConstants.XPayPaymentMode.GOODS);
+ assertEquals(payData.getPaySig(), "52b0abda3c933b0273d328b5c5102ee9ab9249309474ddcdf5e9ce0f80b23532");
+ assertEquals(payData.getSignature(), "602f76d9cadf36c232f7f6c1faa5fe295b0f955d188049997d0df699c0619c86");
+ }
+}
diff --git a/weixin-java-miniapp/src/test/resources/testng.xml b/weixin-java-miniapp/src/test/resources/testng.xml
new file mode 100644
index 0000000000..b34a4415d7
--- /dev/null
+++ b/weixin-java-miniapp/src/test/resources/testng.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index f1fd8b843b..12aa981a0a 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
com.github.binarywang
wx-java
- 4.8.5.B
+ 4.8.6.B
weixin-java-mp
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index bc312c1e67..509733caa4 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
com.github.binarywang
wx-java
- 4.8.5.B
+ 4.8.6.B
weixin-java-open
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResult.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResult.java
index b3d0dd9d94..18e885d671 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResult.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResult.java
@@ -3,6 +3,7 @@
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.math.NumberUtils;
import java.util.List;
@@ -16,11 +17,29 @@
@EqualsAndHashCode(callSuper = false)
public class WxFastMaCanSetCategoryResult extends WxOpenResult {
private static final long serialVersionUID = -2469386233538980102L;
- @SerializedName("errcode")
- private int errCode;
@SerializedName("categories_list")
private CategoriesListBean categoriesList;
+ /**
+ * 错误码，已弃用，未来将删除
+ *
+ * @see WxOpenResult#getErrcode() 应使用此方法
+ */
+ @Deprecated
+ public int getErrCode() {
+ return NumberUtils.toInt(this.errcode);
+ }
+
+ /**
+ * 错误码，已弃用，未来将删除
+ *
+ * @see WxOpenResult#setErrcode(String) 应使用此方法
+ */
+ @Deprecated
+ public void setErrCode(int errCode) {
+ this.errcode = String.valueOf(errCode);
+ }
+
@Data
public static class CategoriesListBean {
private List categories;
diff --git a/weixin-java-open/src/test/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessageTest.java b/weixin-java-open/src/test/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessageTest.java
new file mode 100644
index 0000000000..26bc8a505a
--- /dev/null
+++ b/weixin-java-open/src/test/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessageTest.java
@@ -0,0 +1,138 @@
+package me.chanjar.weixin.open.bean.message;
+
+import me.chanjar.weixin.common.util.crypto.SHA1;
+import me.chanjar.weixin.open.api.impl.WxOpenInMemoryConfigStorage;
+import me.chanjar.weixin.open.util.WxOpenCryptUtil;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+/**
+ * {@link WxOpenXmlMessage} 单元测试
+ */
+public class WxOpenXmlMessageTest {
+
+ private static final String COMPONENT_APP_ID = "wx0000000000000001";
+ private static final String COMPONENT_TOKEN = "test_component_token";
+ /** 43 位 EncodingAESKey 占位值，非真实密钥 */
+ private static final String COMPONENT_AES_KEY = "MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY";
+
+ private static final Pattern ENCRYPT_PATTERN = Pattern.compile("(.*?) ");
+ private static final Pattern NONCE_PATTERN = Pattern.compile("\n"
+ + " 1413192605 \n"
+ + " ";
+
+ private WxOpenInMemoryConfigStorage config() {
+ WxOpenInMemoryConfigStorage config = new WxOpenInMemoryConfigStorage();
+ config.setComponentAppId(COMPONENT_APP_ID);
+ config.setComponentToken(COMPONENT_TOKEN);
+ config.setComponentAesKey(COMPONENT_AES_KEY);
+ return config;
+ }
+
+ private String group(Pattern pattern, String text) {
+ Matcher matcher = pattern.matcher(text);
+ assertTrue(matcher.find(), "未匹配到期望的节点：" + pattern.pattern());
+ return matcher.group(1);
+ }
+
+ @Test
+ public void testFromXmlComponentVerifyTicket() {
+ WxOpenXmlMessage message = WxOpenXmlMessage.fromXml(VERIFY_TICKET_XML);
+ assertNotNull(message);
+ assertEquals(message.getAppId(), COMPONENT_APP_ID);
+ assertEquals(message.getCreateTime(), Long.valueOf(1413192605L));
+ assertEquals(message.getInfoType(), "component_verify_ticket");
+ assertEquals(message.getComponentVerifyTicket(), "ticket@@@abcdefg");
+ }
+
+ @Test
+ public void testFromXmlAuthorized() {
+ String xml = "\n"
+ + " 1413192760 \n"
+ + " 600 \n"
+ + " ";
+
+ WxOpenXmlMessage message = WxOpenXmlMessage.fromXml(xml);
+ assertNotNull(message);
+ assertEquals(message.getInfoType(), "authorized");
+ assertEquals(message.getAuthorizerAppid(), "wx0000000000000002");
+ assertEquals(message.getAuthorizationCode(), "auth_code_value");
+ assertEquals(message.getAuthorizationCodeExpiredTime(), Long.valueOf(600L));
+ assertEquals(message.getPreAuthCode(), "pre_auth_code_value");
+ }
+
+ @Test
+ public void testFromXmlFastRegisterWeApp() {
+ String xml = "\n"
+ + " 1535442403 \n"
+ + " wx0000000000000003 \n"
+ + " 0 \n"
+ + " auth_code_value \n"
+ + " \n"
+ + " \n"
+ + " ";
+
+ WxOpenXmlMessage message = WxOpenXmlMessage.fromXml(xml);
+ assertNotNull(message);
+ assertEquals(message.getSubAppId(), "wx0000000000000003");
+ assertEquals(message.getRegistAppId(), "wx0000000000000003");
+ assertEquals(message.getStatus(), 0);
+ assertEquals(message.getAuthCode(), "auth_code_value");
+ assertEquals(message.getMsg(), "OK");
+ assertNotNull(message.getInfo());
+ assertEquals(message.getInfo().getName(), "тест");
+ }
+
+ @Test
+ public void testFromXmlInputStream() {
+ InputStream is = new ByteArrayInputStream(VERIFY_TICKET_XML.getBytes(StandardCharsets.UTF_8));
+ WxOpenXmlMessage message = WxOpenXmlMessage.fromXml(is);
+ assertNotNull(message);
+ assertEquals(message.getComponentVerifyTicket(), "ticket@@@abcdefg");
+ }
+
+ @Test
+ public void testFromEncryptedXml() {
+ WxOpenInMemoryConfigStorage config = config();
+ String encryptedXml = new WxOpenCryptUtil(config).encrypt(VERIFY_TICKET_XML);
+
+ String encrypt = group(ENCRYPT_PATTERN, encryptedXml);
+ String timestamp = group(TIMESTAMP_PATTERN, encryptedXml);
+ String nonce = group(NONCE_PATTERN, encryptedXml);
+ String signature = SHA1.gen(COMPONENT_TOKEN, timestamp, nonce, encrypt);
+
+ WxOpenXmlMessage message = WxOpenXmlMessage.fromEncryptedXml(encryptedXml, config, timestamp, nonce, signature);
+ assertNotNull(message);
+ assertEquals(message.getComponentVerifyTicket(), "ticket@@@abcdefg");
+ assertEquals(message.getContext(), VERIFY_TICKET_XML);
+
+ InputStream is = new ByteArrayInputStream(encryptedXml.getBytes(StandardCharsets.UTF_8));
+ WxOpenXmlMessage fromStream = WxOpenXmlMessage.fromEncryptedXml(is, config, timestamp, nonce, signature);
+ assertNotNull(fromStream);
+ assertEquals(fromStream.getInfoType(), "component_verify_ticket");
+ }
+}
diff --git a/weixin-java-open/src/test/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResultTest.java b/weixin-java-open/src/test/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResultTest.java
index 11ae649699..aa9f86722d 100644
--- a/weixin-java-open/src/test/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResultTest.java
+++ b/weixin-java-open/src/test/java/me/chanjar/weixin/open/bean/result/WxFastMaCanSetCategoryResultTest.java
@@ -3,7 +3,9 @@
import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
import org.testng.annotations.Test;
+import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
public class WxFastMaCanSetCategoryResultTest {
@@ -73,6 +75,10 @@ public void testFromJson() throws Exception {
assertNotNull(res);
assertNotNull(res.getCategoriesList());
+ assertEquals(res.getErrcode(), "0");
+ assertEquals(res.getErrmsg(), "ok");
+ assertEquals(res.getErrCode(), 0);
+ assertTrue(res.isSuccess());
System.out.println(res);
}
diff --git a/weixin-java-open/src/test/java/me/chanjar/weixin/open/util/WxOpenCryptUtilTest.java b/weixin-java-open/src/test/java/me/chanjar/weixin/open/util/WxOpenCryptUtilTest.java
new file mode 100644
index 0000000000..d6135d6044
--- /dev/null
+++ b/weixin-java-open/src/test/java/me/chanjar/weixin/open/util/WxOpenCryptUtilTest.java
@@ -0,0 +1,87 @@
+package me.chanjar.weixin.open.util;
+
+import me.chanjar.weixin.common.error.WxRuntimeException;
+import me.chanjar.weixin.common.util.crypto.SHA1;
+import me.chanjar.weixin.open.api.impl.WxOpenInMemoryConfigStorage;
+import org.testng.annotations.Test;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.expectThrows;
+
+/**
+ * {@link WxOpenCryptUtil} 单元测试
+ */
+public class WxOpenCryptUtilTest {
+
+ private static final String COMPONENT_APP_ID = "wx0000000000000001";
+ private static final String COMPONENT_TOKEN = "test_component_token";
+ /** 43 位 EncodingAESKey 占位值，非真实密钥 */
+ private static final String COMPONENT_AES_KEY = "MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY";
+
+ private static final Pattern ENCRYPT_PATTERN = Pattern.compile("(.*?) ");
+ private static final Pattern NONCE_PATTERN = Pattern.compile("
+
+
+
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 53b75f138d..cc1f84b59d 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
com.github.binarywang
wx-java
- 4.8.5.B
+ 4.8.6.B
4.0.0
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java
new file mode 100644
index 0000000000..efc5f7b2cc
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsNotifyResult.java
@@ -0,0 +1,30 @@
+package com.github.binarywang.wxpay.bean.ecommerce;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 合单支付 通知结果
+ *
+ * 文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pay/combine/chapter3_7.shtml
+ *
+ */
+@Data
+@NoArgsConstructor
+@Deprecated
+public class CombineTransactionsNotifyResult implements Serializable {
+
+ private static final long serialVersionUID = -4710926828683593250L;
+ /**
+ * 源数据
+ */
+ private NotifyResponse rawData;
+
+ /**
+ * 解密后的数据
+ */
+ private CombineTransactionsResult result;
+
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java
new file mode 100644
index 0000000000..e062a3fbd1
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsRequest.java
@@ -0,0 +1,460 @@
+package com.github.binarywang.wxpay.bean.ecommerce;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 合单支付API
+ *
+ * 文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pages/e-combine.shtml
+ *
+ */
+@Data
+@NoArgsConstructor
+@Deprecated
+public class CombineTransactionsRequest implements Serializable {
+ private static final long serialVersionUID = -1242741645939606441L;
+ /**
+ *
+ * 字段名：合单商户appid
+ * 变量名：combine_appid
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 合单发起方的appid。
+ * 示例值：wxd678efh567hg6787
+ *
+ */
+ @SerializedName(value = "combine_appid")
+ private String combineAppid;
+
+ /**
+ *
+ * 字段名：合单商户号
+ * 变量名：combine_mchid
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 合单发起方商户号。
+ * 示例值：1900000109
+ *
+ */
+ @SerializedName(value = "combine_mchid")
+ private String combineMchid;
+
+ /**
+ *
+ * 字段名：合单商户订单号
+ * 变量名：combine_out_trade_no
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 合单支付总订单号，要求32个字符内，只能是数字、大小写字母_-|*@ ，且在同一个商户号下唯一。
+ * 示例值：P20150806125346
+ *
+ */
+ @SerializedName(value = "combine_out_trade_no")
+ private String combineOutTradeNo;
+
+ /**
+ *
+ * 字段名：+场景信息
+ * 变量名：scene_info
+ * 是否必填：否
+ * 类型：object
+ * 描述：支付场景信息描述
+ *
+ */
+ @SerializedName(value = "scene_info")
+ private SceneInfo sceneInfo;
+
+ /**
+ *
+ * 字段名：+子单信息
+ * 变量名：sub_orders
+ * 是否必填：是
+ * 类型：array
+ * 描述：
+ * 最多支持子单条数：50
+ *
+ *
+ */
+ @SerializedName(value = "sub_orders")
+ private List subOrders;
+
+ /**
+ *
+ * 字段名：+支付者
+ * 变量名：combine_payer_info
+ * 是否必填：否(JSAPI必填)
+ * 类型：object
+ * 描述：支付者信息
+ *
+ */
+ @SerializedName(value = "combine_payer_info")
+ private CombinePayerInfo combinePayerInfo;
+
+ /**
+ *
+ * 字段名：交易起始时间
+ * 变量名：time_start
+ * 是否必填：否
+ * 类型：string(14)
+ * 描述：
+ * 订单生成时间，遵循rfc3339标准格式，格式为YYYY-MM-DDTHH:mm:ss+TIMEZONE，YYYY-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss表示时分秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35+08:00表示，北京时间2015年5月20日 13点29分35秒。
+ * 示例值：2019-12-31T15:59:60+08:00
+ *
+ */
+ @SerializedName(value = "time_start")
+ private String timeStart;
+
+ /**
+ *
+ * 字段名：交易结束时间
+ * 变量名：time_expire
+ * 是否必填：否
+ * 类型：string(14)
+ * 描述：
+ * 订单失效时间，遵循rfc3339标准格式，格式为YYYY-MM-DDTHH:mm:ss+TIMEZONE，YYYY-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss表示时分秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35+08:00表示，北京时间2015年5月20日 13点29分35秒。
+ * 示例值：2019-12-31T15:59:60+08:00
+ *
+ */
+ @SerializedName(value = "time_expire")
+ private String timeExpire;
+
+ /**
+ *
+ * 字段名：通知地址
+ * 变量名：notify_url
+ * 是否必填：是
+ * 类型：string(256)
+ * 描述：
+ * 接收微信支付异步通知回调地址，通知url必须为直接可访问的URL，不能携带参数。
+ * 格式: URL
+ * 示例值：https://yourapp.com/notify
+ *
+ */
+ @SerializedName(value = "notify_url")
+ private String notifyUrl;
+
+
+ @Data
+ @NoArgsConstructor
+ public static class SceneInfo implements Serializable {
+ /**
+ *
+ * 字段名：商户端设备号
+ * 变量名：device_id
+ * 是否必填：否
+ * 类型：string(16)
+ * 描述：
+ * 终端设备号（门店号或收银设备ID）。
+ * 特殊规则：长度最小7个字节
+ * 示例值：POS1:1
+ *
+ */
+ @SerializedName(value = "device_id")
+ private String deviceId;
+
+ /**
+ *
+ * 字段名：用户终端IP
+ * 变量名：payer_client_ip
+ * 是否必填：是
+ * 类型：string(45)
+ * 描述：
+ * 用户端实际ip
+ * 格式: ip(ipv4+ipv6)
+ * 示例值：14.17.22.32
+ *
+ */
+ @SerializedName(value = "payer_client_ip")
+ private String payerClientIp;
+
+ /**
+ *
+ * 字段名：H5场景信息
+ * 变量名：h5_info
+ * 是否必填：否(H5支付必填)
+ * 类型：object
+ * 描述：
+ * H5场景信息
+ *
+ */
+ @SerializedName(value = "h5_info")
+ private H5Info h5Info;
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class SubOrders implements Serializable {
+ /**
+ *
+ * 字段名：子单商户号
+ * 变量名：mchid
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 子单发起方商户号，必须与发起方appid有绑定关系。
+ * 示例值：1900000109
+ * 此处一般填写服务商商户号
+ *
+ */
+ @SerializedName(value = "mchid")
+ private String mchid;
+
+ /**
+ *
+ * 字段名：附加信息
+ * 变量名：attach
+ * 是否必填：是
+ * 类型：string(128)
+ * 描述：
+ * 附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用。
+ * 示例值：深圳分店
+ *
+ */
+ @SerializedName(value = "attach")
+ private String attach;
+
+ /**
+ *
+ * 字段名：+订单金额
+ * 变量名：amount
+ * 是否必填：是
+ * 类型：object
+ * 描述：
+ *
+ */
+ @SerializedName(value = "amount")
+ private Amount amount;
+
+ /**
+ *
+ * 字段名：子单商户订单号
+ * 变量名：out_trade_no
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 商户系统内部订单号，要求32个字符内，只能是数字、大小写字母_-|*@ ，且在同一个商户号下唯一。
+ * 特殊规则：最小字符长度为6
+ * 示例值：20150806125346
+ *
+ */
+ @SerializedName(value = "out_trade_no")
+ private String outTradeNo;
+
+ /**
+ *
+ * 字段名：二级商户号
+ * 变量名：sub_mchid
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 二级商户商户号，由微信支付生成并下发。
+ * 注意：仅适用于电商平台 服务商
+ * 示例值：1900000109
+ *
+ */
+ @SerializedName(value = "sub_mchid")
+ private String subMchid;
+
+ /**
+ *
+ * 字段名：商品描述
+ * 变量名：description
+ * 是否必填：是
+ * 类型：string(128)
+ * 描述：
+ * 商品简单描述。需传入应用市场上的APP名字-实际商品名称，例如：天天爱消除-游戏充值。
+ * 示例值：腾讯充值中心-QQ会员充值
+ *
+ */
+ @SerializedName(value = "description")
+ private String description;
+
+ /**
+ *
+ * 字段名：+结算信息
+ * 变量名：settle_info
+ * 是否必填：否
+ * 类型：Object
+ * 描述：结算信息
+ *
+ */
+ @SerializedName(value = "settle_info")
+ private SettleInfo settleInfo;
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class CombinePayerInfo implements Serializable {
+ /**
+ *
+ * 字段名：用户标识
+ * 变量名：openid
+ * 是否必填：是
+ * 类型：string(128)
+ * 描述：
+ * 使用合单appid获取的对应用户openid。是用户在商户appid下的唯一标识。
+ * 示例值：oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+ *
+ */
+ @SerializedName(value = "openid")
+ private String openid;
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class Amount implements Serializable {
+ /**
+ *
+ * 字段名：标价金额
+ * 变量名：total_amount
+ * 是否必填：是
+ * 类型：int64
+ * 描述：
+ * 子单金额，单位为分。
+ * 示例值：100
+ *
+ */
+ @SerializedName(value = "total_amount")
+ private Integer totalAmount;
+
+ /**
+ *
+ * 字段名：标价币种
+ * 变量名：currency
+ * 是否必填：是
+ * 类型：string(8)
+ * 描述：
+ * 符合ISO 4217标准的三位字母代码，人民币：CNY。
+ * 示例值：CNY
+ *
+ */
+ @SerializedName(value = "currency")
+ private String currency;
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class SettleInfo implements Serializable {
+ /**
+ *
+ * 字段名：是否指定分账
+ * 变量名：profit_sharing
+ * 是否必填：否
+ * 类型：bool
+ * 描述：
+ * 是否分账，与外层profit_sharing同时存在时，以本字段为准。
+ * true：是
+ * false：否
+ * 示例值：true
+ *
+ */
+ @SerializedName(value = "profit_sharing")
+ private Boolean profitSharing;
+
+ /**
+ *
+ * 字段名：补差金额
+ * 变量名：subsidy_amount
+ * 是否必填：否
+ * 类型：int64
+ * 描述：
+ * SettleInfo.profit_sharing为true时，该金额才生效。
+ * 示例值：10
+ *
+ */
+ @SerializedName(value = "subsidy_amount")
+ private Integer subsidyAmount;
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class H5Info implements Serializable {
+
+ /**
+ *
+ * 字段名：场景类型
+ * 变量名：type
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 场景类型，枚举值：
+ * iOS：IOS移动应用；
+ * Android：安卓移动应用；
+ * Wap：WAP网站应用；
+ * 示例值：iOS
+ *
+ */
+ @SerializedName(value = "type")
+ private String type;
+
+ /**
+ *
+ * 字段名：应用名称
+ * 变量名：app_name
+ * 是否必填：否
+ * 类型：string(64)
+ * 描述：
+ * 应用名称
+ * 示例值：王者荣耀
+ *
+ */
+ @SerializedName(value = "app_name")
+ private String appName;
+
+ /**
+ *
+ * 字段名：网站URL
+ * 变量名：app_url
+ * 是否必填：否
+ * 类型：string(128)
+ * 描述：
+ * 网站URL
+ * 示例值：https://pay.qq.com
+ *
+ */
+ @SerializedName(value = "app_url")
+ private String appUrl;
+
+ /**
+ *
+ * 字段名：iOS平台BundleID
+ * 变量名：bundle_id
+ * 是否必填：否
+ * 类型：string(128)
+ * 描述：
+ * iOS平台BundleID
+ * 示例值：com.tencent.wzryiOS
+ *
+ */
+ @SerializedName(value = "bundle_id")
+ private String bundleId;
+
+ /**
+ *
+ * 字段名：Android平台PackageName
+ * 变量名：package_name
+ * 是否必填：否
+ * 类型：string(128)
+ * 描述：
+ * Android平台PackageName
+ * 示例值：com.tencent.tmgp.sgame
+ *
+ */
+ @SerializedName(value = "package_name")
+ private String packageName;
+
+ }
+
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsResult.java
new file mode 100644
index 0000000000..cdab5934fc
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/CombineTransactionsResult.java
@@ -0,0 +1,354 @@
+package com.github.binarywang.wxpay.bean.ecommerce;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 合单支付 查询结果
+ *
+ * 文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pay/combine/chapter3_3.shtml
+ *
+ */
+@Data
+@NoArgsConstructor
+@Deprecated
+public class CombineTransactionsResult implements Serializable {
+
+ /**
+ *
+ * 字段名：合单商户appid
+ * 变量名：combine_appid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 合单发起方的appid。（即电商平台appid）
+ * 示例值：wxd678efh567hg6787
+ *
+ */
+ @SerializedName(value = "combine_appid")
+ private String combineAppid;
+
+ /**
+ *
+ * 字段名：合单商户号
+ * 变量名：combine_mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 合单发起方商户号。（即电商平台mchid）
+ * 示例值：1900000109
+ *
+ */
+ @SerializedName(value = "combine_mchid")
+ private String combineMchid;
+
+ /**
+ *
+ * 字段名：合单商户订单号
+ * 变量名：combine_out_trade_no
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 合单支付总订单号，要求32个字符内，只能是数字、大小写字母_-|*@ ，且在同一个商户号下唯一。
+ * 示例值：P20150806125346
+ *
+ */
+ @SerializedName(value = "combine_out_trade_no")
+ private String combineOutTradeNo;
+
+ /**
+ *
+ * 字段名：+场景信息
+ * 变量名：scene_info
+ * 是否必填：否
+ * 类型：object
+ * 描述：支付场景信息描述
+ *
+ */
+ @SerializedName(value = "scene_info")
+ private SceneInfo sceneInfo;
+
+ /**
+ *
+ * 字段名：+子单信息
+ * 变量名：sub_orders
+ * 是否必填：是
+ * 类型：array
+ * 描述：
+ * 最多支持子单条数：50
+ *
+ *
+ */
+ @SerializedName(value = "sub_orders")
+ private List subOrders;
+
+ /**
+ *
+ * 字段名：+支付者
+ * 变量名：combine_payer_info
+ * 是否必填：否
+ * 类型：object
+ * 描述：示例值：见请求示例
+ *
+ */
+ @SerializedName(value = "combine_payer_info")
+ private CombinePayerInfo combinePayerInfo;
+
+ @Data
+ @NoArgsConstructor
+ public static class SubOrders implements Serializable {
+ /**
+ *
+ * 字段名：子单商户号
+ * 变量名：mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 子单发起方商户号，必须与发起方Appid有绑定关系。（即电商平台mchid）
+ * 示例值：1900000109
+ *
+ */
+ @SerializedName(value = "mchid")
+ private String mchid;
+
+ /**
+ *
+ * 字段名：交易类型
+ * 变量名：trade_type
+ * 是否必填：是
+ * 类型：string （16）
+ * 描述：
+ * 枚举值：
+ * NATIVE：扫码支付
+ * JSAPI：公众号支付
+ * APP：APP支付
+ * MWEB：H5支付
+ * 示例值： JSAPI
+ *
+ */
+ @SerializedName(value = "trade_type")
+ private String tradeType;
+
+ /**
+ *
+ * 字段名：交易状态
+ * 变量名：trade_state
+ * 是否必填：是
+ * 类型：string （32）
+ * 描述：
+ * 枚举值：
+ * SUCCESS：支付成功
+ * REFUND：转入退款
+ * NOTPAY：未支付
+ * CLOSED：已关闭
+ * USERPAYING：用户支付中
+ * PAYERROR：支付失败(其他原因，如银行返回失败)
+ * 示例值： SUCCESS
+ *
+ */
+ @SerializedName(value = "trade_state")
+ private String tradeState;
+
+ /**
+ *
+ * 字段名：付款银行
+ * 变量名：bank_type
+ * 是否必填：否
+ * 类型：string（16）
+ * 描述：
+ * 银行类型，采用字符串类型的银行标识。
+ * 示例值：CMC
+ *
+ */
+ @SerializedName(value = "bank_type")
+ private String bankType;
+
+ /**
+ *
+ * 字段名：附加信息
+ * 变量名：attach
+ * 是否必填：是
+ * 类型：string（128）
+ * 描述：
+ * 附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用。
+ * 示例值：深圳分店
+ *
+ */
+ @SerializedName(value = "attach")
+ private String attach;
+
+ /**
+ *
+ * 字段名：支付完成时间
+ * 变量名：success_time
+ * 是否必填：是
+ * 类型：string（16）
+ * 描述：
+ * 订单支付时间，遵循rfc3339标准格式，格式为YYYY-MM-DDTHH:mm:ss:sss+TIMEZONE，YYYY-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss:sss表示时分秒毫秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35.120+08:00表示，北京时间2015年5月20日 13点29分35秒。
+ * 示例值：2015-05-20T13:29:35.120+08:00
+ *
+ */
+ @SerializedName(value = "success_time")
+ private String successTime;
+
+ /**
+ *
+ * 字段名：微信订单号
+ * 变量名：transaction_id
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 微信支付订单号。
+ * 示例值： 1009660380201506130728806387
+ *
+ */
+ @SerializedName(value = "transaction_id")
+ private String transactionId;
+
+ /**
+ *
+ * 字段名：子单商户订单号
+ * 变量名：out_trade_no
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 商户系统内部订单号，要求32个字符内，只能是数字、大小写字母_-|*@ ，且在同一个商户号下唯一。
+ * 特殊规则：最小字符长度为6
+ * 示例值：20150806125346
+ *
+ */
+ @SerializedName(value = "out_trade_no")
+ private String outTradeNo;
+
+ /**
+ *
+ * 字段名：二级商户号
+ * 变量名：sub_mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 二级商户商户号，由微信支付生成并下发。
+ * 注意：仅适用于电商平台 服务商
+ * 示例值：1900000109
+ *
+ */
+ @SerializedName(value = "sub_mchid")
+ private String subMchid;
+
+ /**
+ *
+ * 字段名：+订单金额
+ * 变量名：amount
+ * 是否必填：是
+ * 类型：object
+ * 描述：订单金额信息
+ *
+ */
+ @SerializedName(value = "amount")
+ private Amount amount;
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class SceneInfo implements Serializable {
+ /**
+ *
+ * 字段名：商户端设备号
+ * 变量名：device_id
+ * 是否必填：否
+ * 类型：string（16）
+ * 描述：
+ * 终端设备号（门店号或收银设备ID）。
+ * 特殊规则：长度最小7个字节
+ * 示例值：POS1:1
+ *
+ */
+ @SerializedName(value = "device_id")
+ private String deviceId;
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class CombinePayerInfo implements Serializable {
+ /**
+ *
+ * 字段名：用户标识
+ * 变量名：openid
+ * 是否必填：是
+ * 类型：string（128）
+ * 描述：
+ * 使用合单appid获取的对应用户openid。是用户在商户appid下的唯一标识。
+ * 示例值：oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+ *
+ */
+ @SerializedName(value = "openid")
+ private String openid;
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class Amount implements Serializable {
+ /**
+ *
+ * 字段名：标价金额
+ * 变量名：total_amount
+ * 是否必填：是
+ * 类型：int64
+ * 描述：
+ * 子单金额，单位为分。
+ * 示例值：100
+ *
+ */
+ @SerializedName(value = "total_amount")
+ private Integer totalAmount;
+
+ /**
+ *
+ * 字段名：标价币种
+ * 变量名：currency
+ * 是否必填：是
+ * 类型：string（8）
+ * 描述：
+ * 符合ISO 4217标准的三位字母代码，人民币：CNY。
+ * 示例值：CNY
+ *
+ */
+ @SerializedName(value = "currency")
+ private String currency;
+
+ /**
+ *
+ * 字段名：现金支付金额
+ * 变量名：payer_amount
+ * 是否必填：是
+ * 类型：int64
+ * 描述：
+ * 订单现金支付金额。
+ * 示例值：10
+ *
+ */
+ @SerializedName(value = "payer_amount")
+ private Integer payerAmount;
+
+ /**
+ *
+ * 字段名：现金支付币种
+ * 变量名：payer_currency
+ * 是否必填：是
+ * 类型：string（8）
+ * 描述：
+ * 货币类型，符合ISO 4217标准的三位字母代码，默认人民币：CNY。
+ * 示例值： CNY
+ *
+ */
+ @SerializedName(value = "payer_currency")
+ private String payerCurrency;
+ }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsCloseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsCloseRequest.java
new file mode 100644
index 0000000000..224879ebd1
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsCloseRequest.java
@@ -0,0 +1,63 @@
+package com.github.binarywang.wxpay.bean.ecommerce;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 关闭普通订单请求
+ *
+ * @author f00lish
+ * created on 2020/12/09
+ */
+@Data
+@NoArgsConstructor
+@Deprecated
+public class PartnerTransactionsCloseRequest implements Serializable {
+
+ private static final long serialVersionUID = -7602636370950088329L;
+
+ /**
+ *
+ * 字段名：服务商户号
+ * 变量名：sp_mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 服务商户号，由微信支付生成并下发
+ * 示例值：1230000109
+ *
+ */
+ @SerializedName(value = "sp_mchid")
+ private String spMchid;
+
+ /**
+ *
+ * 字段名：二级商户号
+ * 变量名：sub_mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 二级商户的商户号，有微信支付生成并下发。
+ * 示例值：1900000109
+ *
+ */
+ @SerializedName(value = "sub_mchid")
+ private String subMchid;
+
+ /**
+ *
+ * 字段名：商户订单号
+ * 变量名：out_trade_no
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 商户系统内部订单号，只能是数字、大小写字母_-*且在同一个商户号下唯一，详见【商户订单号】。
+ * 特殊规则：最小字符长度为6
+ * 示例值：1217752501201407033233368018
+ *
+ */
+ private transient String outTradeNo;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java
new file mode 100644
index 0000000000..6b4bac8a94
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsNotifyResult.java
@@ -0,0 +1,28 @@
+package com.github.binarywang.wxpay.bean.ecommerce;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 普通支付 通知结果
+ *
+ * 文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/e_transactions/chapter3_11.shtml
+ *
+ */
+@Data
+@NoArgsConstructor
+@Deprecated
+public class PartnerTransactionsNotifyResult implements Serializable {
+ private static final long serialVersionUID = -6602962275015706689L;
+ /**
+ * 源数据
+ */
+ private NotifyResponse rawData;
+
+ /**
+ * 解密后的数据
+ */
+ private PartnerTransactionsResult result;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsQueryRequest.java
new file mode 100644
index 0000000000..97cf2fe707
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsQueryRequest.java
@@ -0,0 +1,70 @@
+package com.github.binarywang.wxpay.bean.ecommerce;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+@Deprecated
+public class PartnerTransactionsQueryRequest implements Serializable {
+
+
+ /**
+ *
+ * 字段名：服务商户号
+ * 变量名：sp_mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 服务商户号，由微信支付生成并下发
+ * 示例值：1230000109
+ *
+ */
+ @SerializedName(value = "sp_mchid")
+ private String spMchid;
+
+ /**
+ *
+ * 字段名：二级商户号
+ * 变量名：sub_mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 二级商户的商户号，有微信支付生成并下发。
+ * 示例值：1900000109
+ *
+ */
+ @SerializedName(value = "sub_mchid")
+ private String subMchid;
+
+ /**
+ *
+ * 字段名：微信支付订单号
+ * 变量名：transaction_id
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 微信支付系统生成的订单号
+ * 示例值：1217752501201407033233368018
+ *
+ */
+ @SerializedName(value = "transaction_id")
+ private String transactionId;
+ /**
+ *
+ * 字段名：商户订单号
+ * 变量名：out_trade_no
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 商户系统内部订单号，只能是数字、大小写字母_-*且在同一个商户号下唯一，详见【商户订单号】。
+ * 特殊规则：最小字符长度为6
+ * 示例值：1217752501201407033233368018
+ *
+ */
+ @SerializedName(value = "out_trade_no")
+ private String outTradeNo;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsRequest.java
new file mode 100644
index 0000000000..19e2ccca1e
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsRequest.java
@@ -0,0 +1,647 @@
+package com.github.binarywang.wxpay.bean.ecommerce;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 普通支付（电商收付通）API
+ *
+ * 文档地址:https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/pages/e_transactions.shtml
+ *
+ *
+ * @author cloudX
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Deprecated
+public class PartnerTransactionsRequest implements Serializable {
+ private static final long serialVersionUID = -1550405819444680465L;
+
+ /**
+ *
+ * 字段名：服务商公众号ID
+ * 变量名：sp_appid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 服务商申请的公众号或移动应用appid
+ * 示例值：wx8888888888888888
+ *
+ */
+ @SerializedName(value = "sp_appid")
+ private String spAppid;
+ /**
+ *
+ * 字段名：服务商户号
+ * 变量名：sp_mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 服务商户号，由微信支付生成并下发
+ * 示例值：1230000109
+ *
+ */
+ @SerializedName(value = "sp_mchid")
+ private String spMchid;
+ /**
+ *
+ * 字段名：子商户公众号ID
+ * 变量名：sub_appid
+ * 是否必填：否
+ * 类型：string（32）
+ * 描述：
+ * 子商户申请的公众号或移动应用appid。
+ * 示例值：wxd678efh567hg6999
+ *
+ */
+ @SerializedName(value = "sub_appid")
+ private String subAppid;
+ /**
+ *
+ * 字段名：二级商户号
+ * 变量名：sub_mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 二级商户的商户号，有微信支付生成并下发。
+ * 示例值：1900000109
+ *
+ */
+ @SerializedName(value = "sub_mchid")
+ private String subMchid;
+ /**
+ *
+ * 字段名：商品描述
+ * 变量名：description
+ * 是否必填：是
+ * 类型：string（127）
+ * 描述：
+ * 商品描述
+ * 示例值：Image形象店-深圳腾大-QQ公仔
+ *
+ */
+ @SerializedName(value = "description")
+ private String description;
+ /**
+ *
+ * 字段名：商户订单号
+ * 变量名：out_trade_no
+ * 是否必填：是
+ * 类型：string（127）
+ * 描述：
+ * 商户系统内部订单号, 只能是数字、大小写字母_-*且在同一个商户号下唯一，详见【商户订单号】
+ * 特殊规则：最小字符长度为6
+ * 示例值：1217752501201407033233368018
+ *
+ */
+ @SerializedName(value = "out_trade_no")
+ private String outTradeNo;
+ /**
+ *
+ * 字段名：交易结束时间
+ * 变量名：time_expire
+ * 是否必填：否
+ * 类型：string(14)
+ * 描述：
+ * 订单失效时间，遵循rfc3339标准格式，格式为YYYY-MM-DDTHH:mm:ss+TIMEZONE，YYYY-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss表示时分秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35+08:00表示，北京时间2015年5月20日 13点29分35秒。
+ * 示例值：2019-12-31T15:59:60+08:00
+ *
+ */
+ @SerializedName(value = "time_expire")
+ private String timeExpire;
+ /**
+ *
+ * 字段名：附加数据
+ * 变量名：attach
+ * 是否必填：否
+ * 类型：string(128)
+ * 描述：
+ * 附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用。
+ * 示例值：自定义数据
+ *
+ */
+ @SerializedName(value = "attach")
+ private String attach;
+ /**
+ *
+ * 字段名：通知地址
+ * 变量名：notify_url
+ * 是否必填：是
+ * 类型：string（127）
+ * 描述：
+ * 通知URL必须为直接可访问的URL，不允许携带查询串。
+ * 示例值：https://www.weixin.qq.com/wxpay/pay.php
+ *
+ */
+ @SerializedName(value = "notify_url")
+ private String notifyUrl;
+ /**
+ *
+ * 字段名：订单优惠标记
+ * 变量名：goods_tag
+ * 是否必填：否
+ * 类型：string（32）
+ * 描述：
+ * 订单优惠标记
+ * 示例值：WXG
+ *
+ */
+ @SerializedName(value = "goods_tag")
+ private String goodsTag;
+ /**
+ *
+ * 字段名：电子发票入口开放标识
+ * 变量名：support_fapiao
+ * 是否必填：否
+ * 类型：boolean
+ * 描述：传入true时，支付成功消息和支付详情页将出现开票入口。需要在微信支付商户平台或微信公众平台开通电子发票功能，传此字段才可生效。
+ *
+ */
+ @SerializedName(value = "support_fapiao")
+ private Boolean supportFapiao;
+ /**
+ *
+ * 字段名：+结算信息
+ * 变量名：settle_info
+ * 是否必填：否
+ * 类型：Object
+ * 描述：结算信息
+ *
+ */
+ @SerializedName(value = "settle_info")
+ private SettleInfo settleInfo;
+ /**
+ *
+ * 字段名：订单金额
+ * 变量名：amount
+ * 是否必填：是
+ * 类型：object
+ * 描述：
+ * 订单金额信息
+ *
+ */
+ @SerializedName(value = "amount")
+ private Amount amount;
+ /**
+ *
+ * 字段名：优惠功能
+ * 变量名：detail
+ * 是否必填：否
+ * 类型：object
+ * 描述：
+ * 优惠功能
+ *
+ */
+ @SerializedName(value = "detail")
+ private Discount detail;
+ /**
+ *
+ * 字段名：支付者
+ * 变量名：payer
+ * 是否必填：是（仅JSAPI支付必传）
+ * 类型：object
+ * 描述：
+ * 支付者信息
+ *
+ */
+ @SerializedName(value = "payer")
+ private Payer payer;
+ /**
+ *
+ * 字段名：场景信息
+ * 变量名：scene_info
+ * 是否必填：是（仅H5支付必传）
+ * 类型：object
+ * 描述：
+ * 支付场景描述
+ *
+ */
+ @SerializedName(value = "scene_info")
+ private SceneInfo sceneInfo;
+
+ @Data
+ @NoArgsConstructor
+ public static class Discount implements Serializable {
+ private static final long serialVersionUID = 1090134053810201492L;
+
+ /**
+ *
+ * 字段名：订单原价
+ * 变量名：cost_price
+ * 是否必填：否
+ * 类型：int64
+ * 描述：
+ * 1、商户侧一张小票订单可能被分多次支付，订单原价用于记录整张小票的交易金额。
+ * 2、当订单原价与支付金额不相等，则不享受优惠。
+ * 3、该字段主要用于防止同一张小票分多次支付，以享受多次优惠的情况，正常支付订单不必上传此参数。
+ * 示例值：608800
+ *
+ */
+ @SerializedName(value = "cost_price")
+ private Integer costPrice;
+ /**
+ *
+ * 字段名：商品小票ID
+ * 变量名：invoice_id
+ * 是否必填：否
+ * 类型：string（32）
+ * 描述：
+ * 商品小票ID
+ * 示例值：微信123
+ *
+ */
+ @SerializedName(value = "invoice_id")
+ private String invoiceId;
+ /**
+ *
+ * 字段名：单品列表
+ * 变量名：goods_detail
+ * 是否必填：否
+ * 类型：array
+ * 描述：
+ * 单品列表信息
+ * 条目个数限制：【1，undefined】
+ *
+ */
+ @SerializedName(value = "goods_detail")
+ private List goodsDetails;
+ }
+
+ @Data
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class Amount implements Serializable {
+ private static final long serialVersionUID = -4967636398225864273L;
+
+ /**
+ *
+ * 字段名：总金额
+ * 变量名：total
+ * 是否必填：是
+ * 类型：int64
+ * 描述：
+ * 订单总金额，单位为分。
+ * 示例值：100
+ *
+ */
+ @SerializedName(value = "total")
+ private Integer total;
+ /**
+ *
+ * 字段名：币类型
+ * 变量名：currency
+ * 是否必填：否
+ * 类型：string(16)
+ * 描述：
+ * CNY：人民币，境内商户号仅支持人民币。
+ * 示例值：CNY
+ *
+ */
+ @SerializedName(value = "currency")
+ private String currency;
+ }
+
+ @Data
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class Payer implements Serializable {
+ private static final long serialVersionUID = -3946401119476159971L;
+
+ /**
+ *
+ * 字段名：用户服务标识
+ * 变量名：sp_openid
+ * 是否必填：是
+ * 类型：string(128)
+ * 描述：
+ * 用户在服务商appid下的唯一标识。
+ * 示例值：oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+ *
+ */
+ @SerializedName(value = "sp_openid")
+ private String spOpenid;
+ /**
+ *
+ * 字段名：用户子标识
+ * 变量名：sub_openid
+ * 是否必填：否
+ * 类型：string(128)
+ * 描述：
+ * 用户在子商户appid下的唯一标识。
+ * 示例值：oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+ *
+ */
+ @SerializedName(value = "sub_openid")
+ private String subOpenid;
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class SettleInfo implements Serializable {
+ private static final long serialVersionUID = 4438958789491671746L;
+
+ /**
+ *
+ * 字段名：是否指定分账
+ * 变量名：profit_sharing
+ * 是否必填：否
+ * 类型：bool
+ * 描述：
+ * 是否分账，与外层profit_sharing同时存在时，以本字段为准。
+ * true：是
+ * false：否
+ * 示例值：true
+ *
+ */
+ @SerializedName(value = "profit_sharing")
+ private Boolean profitSharing;
+ /**
+ *
+ * 字段名：补差金额
+ * 变量名：subsidy_amount
+ * 是否必填：否
+ * 类型：int64
+ * 描述：
+ * SettleInfo.profit_sharing为true时，该金额才生效。
+ * 注意：单笔订单最高补差金额为5000元
+ * 示例值：10
+ *
+ */
+ @SerializedName(value = "subsidy_amount")
+ private BigDecimal subsidyAmount;
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class GoodsDetail implements Serializable {
+ private static final long serialVersionUID = -2574001236925022932L;
+
+ /**
+ *
+ * 字段名：商户侧商品编码
+ * 变量名：merchant_goods_id
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 由半角的大小写字母、数字、中划线、下划线中的一种或几种组成。
+ * 示例值：商品编码
+ *
+ */
+ @SerializedName(value = "merchant_goods_id")
+ private String merchantGoodsId;
+ /**
+ *
+ * 字段名：微信侧商品编码
+ * 变量名：wechatpay_goods_id
+ * 是否必填：否
+ * 类型：string(32)
+ * 描述：
+ * 微信支付定义的统一商品编号（没有可不传）
+ * 示例值：1001
+ *
+ */
+ @SerializedName(value = "wechatpay_goods_id")
+ private String wechatpayGoodsId;
+ /**
+ *
+ * 字段名：商品名称
+ * 变量名：goods_name
+ * 是否必填：否
+ * 类型：string(256)
+ * 描述：
+ * 商品的实际名称
+ * 示例值：iPhoneX 256G
+ *
+ */
+ @SerializedName(value = "goods_name")
+ private String goodsName;
+ /**
+ *
+ * 字段名：商品数量
+ * 变量名：quantity
+ * 是否必填：是
+ * 类型：int64
+ * 描述：
+ * 用户购买的数量
+ * 示例值：1
+ *
+ */
+ @SerializedName(value = "quantity")
+ private Integer quantity;
+ /**
+ *
+ * 字段名：商品单价
+ * 变量名：unit_price
+ * 是否必填：是
+ * 类型：int64
+ * 描述：
+ * 商品单价，单位为分
+ * 示例值：828800
+ *
+ */
+ @SerializedName(value = "unit_price")
+ private Integer unitPrice;
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class SceneInfo implements Serializable {
+ private static final long serialVersionUID = 4678263124015070957L;
+
+ /**
+ *
+ * 字段名：商户端设备号
+ * 变量名：device_id
+ * 是否必填：否
+ * 类型：string(16)
+ * 描述：
+ * 终端设备号（门店号或收银设备ID）。
+ * 特殊规则：长度最小7个字节
+ * 示例值：POS1:1
+ *
+ */
+ @SerializedName(value = "device_id")
+ private String deviceId;
+ /**
+ *
+ * 字段名：用户终端IP
+ * 变量名：payer_client_ip
+ * 是否必填：是
+ * 类型：string(45)
+ * 描述：
+ * 用户端实际ip
+ * 格式: ip(ipv4+ipv6)
+ * 示例值：14.17.22.32
+ *
+ */
+ @SerializedName(value = "payer_client_ip")
+ private String payerClientIp;
+ /**
+ *
+ * 字段名：H5场景信息
+ * 变量名：h5_info
+ * 是否必填：否(H5支付必填)
+ * 类型：object
+ * 描述：
+ * H5场景信息
+ *
+ */
+ @SerializedName(value = "h5_info")
+ private H5Info h5Info;
+ /**
+ *
+ * 字段名：商户门店信息
+ * 变量名：store_info
+ * 是否必填：否(H5支付必填)
+ * 类型：object
+ * 描述：
+ * 商户门店信息
+ *
+ */
+ @SerializedName(value = "store_info")
+ private StoreInfo storeInfo;
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class H5Info implements Serializable {
+ private static final long serialVersionUID = -6865738707329486532L;
+
+ /**
+ *
+ * 字段名：场景类型
+ * 变量名：type
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 场景类型，枚举值：
+ * iOS：IOS移动应用；
+ * Android：安卓移动应用；
+ * Wap：WAP网站应用；
+ * 示例值：iOS
+ *
+ */
+ @SerializedName(value = "type")
+ private String type;
+ /**
+ *
+ * 字段名：应用名称
+ * 变量名：app_name
+ * 是否必填：否
+ * 类型：string(64)
+ * 描述：
+ * 应用名称
+ * 示例值：王者荣耀
+ *
+ */
+ @SerializedName(value = "app_name")
+ private String appName;
+ /**
+ *
+ * 字段名：网站URL
+ * 变量名：app_url
+ * 是否必填：否
+ * 类型：string(128)
+ * 描述：
+ * 网站URL
+ * 示例值：https://pay.qq.com
+ *
+ */
+ @SerializedName(value = "app_url")
+ private String appUrl;
+ /**
+ *
+ * 字段名：iOS平台BundleID
+ * 变量名：bundle_id
+ * 是否必填：否
+ * 类型：string(128)
+ * 描述：
+ * iOS平台BundleID
+ * 示例值：com.tencent.wzryiOS
+ *
+ */
+ @SerializedName(value = "bundle_id")
+ private String bundleId;
+ /**
+ *
+ * 字段名：Android平台PackageName
+ * 变量名：package_name
+ * 是否必填：否
+ * 类型：string(128)
+ * 描述：
+ * Android平台PackageName
+ * 示例值：com.tencent.tmgp.sgame
+ *
+ */
+ @SerializedName(value = "package_name")
+ private String packageName;
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class StoreInfo implements Serializable {
+ private static final long serialVersionUID = -8002411737407580701L;
+
+ /**
+ *
+ * 字段名：门店编号
+ * 变量名：id
+ * 是否必填：否
+ * 类型：string(32)
+ * 描述：
+ * 商户侧门店编号
+ * 示例值：0001
+ *
+ */
+ @SerializedName(value = "id")
+ private String id;
+ /**
+ *
+ * 字段名：门店名称
+ * 变量名：name
+ * 是否必填：是
+ * 类型：string(256)
+ * 描述：
+ * 商户侧门店名称
+ * 示例值：腾讯大厦分店
+ *
+ */
+ @SerializedName(value = "name")
+ private String name;
+ /**
+ *
+ * 字段名：地区编码
+ * 变量名：area_code
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：
+ * 地区编码，详细请见省市区编号对照表(https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/applyments/chapter4_1.shtml)。
+ * 示例值：440305
+ *
+ */
+ @SerializedName(value = "area_code")
+ private String areaCode;
+ /**
+ *
+ * 字段名：详细地址
+ * 变量名：address
+ * 是否必填：是
+ * 类型：string(512)
+ * 描述：
+ * 详细的商户门店地址
+ * 示例值：广东省深圳市南山区科技中一道10000号
+ *
+ */
+ @SerializedName(value = "address")
+ private String address;
+ }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java
new file mode 100644
index 0000000000..aa7ca7fcd1
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/PartnerTransactionsResult.java
@@ -0,0 +1,601 @@
+package com.github.binarywang.wxpay.bean.ecommerce;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 普通支付 查询结果
+ *
+ * 文档地址：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/ecommerce/e_transactions/chapter3_5.shtml
+ *
+ * @author cloudX
+ */
+@Data
+@NoArgsConstructor
+@Deprecated
+public class PartnerTransactionsResult implements Serializable {
+ private static final long serialVersionUID = 2371448241965534820L;
+
+ /**
+ *
+ * 字段名：服务商公众号ID
+ * 变量名：sp_appid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 服务商申请的公众号或移动应用appid。
+ * 示例值：wx8888888888888888
+ *
+ */
+ @SerializedName(value = "sp_appid")
+ private String spAppid;
+
+ /**
+ *
+ * 字段名：服务商户号
+ * 变量名：sp_mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 服务商户号，由微信支付生成并下发
+ * 示例值：1230000109
+ *
+ */
+ @SerializedName(value = "sp_mchid")
+ private String spMchid;
+
+ /**
+ *
+ * 字段名：二级商户公众号ID
+ * 变量名：sub_appid
+ * 是否必填：否
+ * 类型：string（32）
+ * 描述：
+ * 二级商户申请的公众号或移动应用appid。
+ * 示例值：wxd678efh567hg6999
+ *
+ */
+ @SerializedName(value = "sub_appid")
+ private String subAppid;
+
+ /**
+ *
+ * 字段名：二级商户号
+ * 变量名：sub_mchid
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：
+ * 二级商户的商户号，有微信支付生成并下发。
+ * 示例值：1900000109
+ *
+ */
+ @SerializedName(value = "sub_mchid")
+ private String subMchid;
+
+ /**
+ *
+ * 字段名：+商户订单号
+ * 变量名：out_trade_no
+ * 是否必填：是
+ * 类型：string（32)
+ * 描述：商户系统内部订单号，只能是数字、大小写字母_-*且在同一个商户号下唯一，详见【商户订单号】。
+ * 特殊规则：最小字符长度为6
+ * 示例值：1217752501201407033233368018
+ *
+ */
+ @SerializedName(value = "out_trade_no")
+ private String outTradeNo;
+
+ /**
+ *
+ * 字段名：微信支付订单号
+ * 变量名：transaction_id
+ * 是否必填：否
+ * 类型：string（32）
+ * 描述：微信支付系统生成的订单号。
+ * 示例值：1217752501201407033233368018
+ *
+ */
+ @SerializedName(value = "transaction_id")
+ private String transactionId;
+
+ /**
+ *
+ * 字段名：交易类型
+ * 变量名：trade_type
+ * 是否必填：否
+ * 类型：string（16）
+ * 描述：交易类型，枚举值：
+ * JSAPI：公众号支付
+ * NATIVE：扫码支付
+ * APP：APP支付
+ * MICROPAY：付款码支付
+ * MWEB：H5支付
+ * FACEPAY：刷脸支付
+ *
+ * 示例值： MICROPAY
+ *
+ */
+ @SerializedName(value = "trade_type")
+ private String tradeType;
+
+ /**
+ *
+ * 字段名：交易状态
+ * 变量名：trade_state
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述：交易状态，枚举值：
+ * SUCCESS：支付成功
+ * REFUND：转入退款
+ * NOTPAY：未支付
+ * CLOSED：已关闭
+ * REVOKED：已撤销（付款码支付）
+ * USERPAYING：用户支付中（付款码支付）
+ * PAYERROR：支付失败(其他原因，如银行返回失败)
+ *
+ * 示例值：SUCCESS
+ *
+ */
+ @SerializedName(value = "trade_state")
+ private String tradeState;
+
+ /**
+ *
+ * 字段名：交易状态描述
+ * 变量名：trade_state_desc
+ * 是否必填：是
+ * 类型：string（256）
+ * 描述：交易状态描述
+ * 示例值：支付失败，请重新下单支付
+ *
+ */
+ @SerializedName(value = "trade_state_desc")
+ private String tradeStateDesc;
+
+ /**
+ *
+ * 字段名：付款银行
+ * 变量名：bank_type
+ * 是否必填：否
+ * 类型：string（16）
+ * 描述：银行类型，采用字符串类型的银行标识。
+ * 示例值：CMC
+ *
+ */
+ @SerializedName(value = "bank_type")
+ private String bankType;
+
+ /**
+ *
+ * 字段名：附加数据
+ * 变量名：attach
+ * 是否必填：否
+ * 类型：string（128）
+ * 描述：附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用
+ * 示例值：自定义数据
+ *
+ */
+ @SerializedName(value = "attach")
+ private String attach;
+
+ /**
+ *
+ * 字段名：支付完成时间
+ * 变量名：success_time
+ * 是否必填：否
+ * 类型：string（64）
+ * 描述：支付完成时间，遵循rfc3339标准格式，格式为YYYY-MM-DDTHH:mm:ss+TIMEZONE，YYYY-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss表示时分秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35+08:00表示，北京时间2015年5月20日 13点29分35秒。
+ * 示例值：2018-06-08T10:34:56+08:00
+ *
+ */
+ @SerializedName(value = "success_time")
+ private String successTime;
+
+ /**
+ *
+ * 字段名：支付者信息
+ * 变量名：payer
+ * 是否必填：是
+ * 类型：object
+ * 描述：基础支付支付者信息
+ *
+ */
+ private CombinePayerInfo payer;
+
+ /**
+ *
+ * 字段名：支付者
+ * 变量名：combine_payer_info
+ * 是否必填：否
+ * 类型：object
+ * 描述：合单支付支付者信息，示例值：见请求示例
+ *
+ */
+ @SerializedName(value = "combine_payer_info")
+ private CombinePayerInfo combinePayerInfo;
+
+ /**
+ *
+ * 字段名：订单金额
+ * 变量名：amount
+ * 是否必填：是
+ * 类型：object
+ * 描述：订单金额信息
+ *
+ */
+ @SerializedName(value = "amount")
+ private Amount amount;
+
+ /**
+ *
+ * 字段名：场景信息
+ * 变量名：scene_info
+ * 是否必填：否
+ * 类型：object
+ * 描述：支付场景信息描述
+ *
+ */
+ @SerializedName(value = "scene_info")
+ private SceneInfo sceneInfo;
+
+ /**
+ *
+ * 字段名：优惠功能
+ * 变量名：promotion_detail
+ * 是否必填：否
+ * 类型：array
+ * 描述：优惠功能，享受优惠时返回该字段。
+ *
+ */
+ @SerializedName(value = "promotion_detail")
+ private List promotionDetails;
+
+ @Data
+ @NoArgsConstructor
+ public static class SceneInfo implements Serializable {
+ /**
+ *
+ * 字段名：商户端设备号
+ * 变量名：device_id
+ * 是否必填：否
+ * 类型：string（16）
+ * 描述：
+ * 终端设备号（门店号或收银设备ID）。
+ * 特殊规则：长度最小7个字节
+ * 示例值：POS1:1
+ *
+ */
+ @SerializedName(value = "device_id")
+ private String deviceId;
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class CombinePayerInfo implements Serializable {
+ /**
+ *
+ * 字段名：用户标识
+ * 变量名：sp_openid
+ * 是否必填：是
+ * 类型：string（128）
+ * 描述：
+ * 用户在服务商appid下的唯一标识。
+ * 示例值：oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+ *
+ */
+ @SerializedName(value = "sp_openid")
+ private String spOpenid;
+
+
+ /**
+ *
+ * 字段名：二级商户用户标识
+ * 变量名：sub_openid
+ * 是否必填：否
+ * 类型：string（128）
+ * 描述：
+ * 用户在二级商户appid下的唯一标识。
+ * 示例值：oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+ *
+ */
+ @SerializedName(value = "sub_openid")
+ private String subOpenid;
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class Amount implements Serializable {
+ /**
+ *
+ * 字段名：总金额
+ * 变量名：total
+ * 是否必填：否
+ * 类型：int
+ * 描述：
+ * 订单总金额，单位为分
+ * 示例值：100
+ *
+ */
+ @SerializedName(value = "total")
+ private Integer total;
+
+
+ /**
+ *
+ * 字段名：用户支付金额
+ * 变量名：payer_total
+ * 是否必填：否
+ * 类型：int
+ * 描述：
+ * 用户支付金额，单位为分。
+ * 示例值：100
+ *
+ */
+ @SerializedName(value = "payer_total")
+ private Integer payerTotal;
+
+
+ /**
+ *
+ * 字段名：货币类型
+ * 变量名：currency
+ * 是否必填：否
+ * 类型：string（16）
+ * 描述：
+ * CNY：人民币，境内商户号仅支持人民币。
+ * 示例值：CNY
+ *
+ */
+ @SerializedName(value = "currency")
+ private String currency;
+
+
+ /**
+ *
+ * 字段名：用户支付币种
+ * 变量名：payer_currency
+ * 是否必填：否
+ * 类型：string（8）
+ * 描述：
+ * 用户支付币种
+ * 示例值： CNY
+ *
+ */
+ @SerializedName(value = "payer_currency")
+ private String payerCurrency;
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class PromotionDetail implements Serializable {
+
+ /**
+ *
+ * 字段名：券ID
+ * 变量名：coupon_id
+ * 是否必填：是
+ * 类型：string（32）
+ * 描述： 券ID
+ * 示例值：109519
+ *
+ */
+ @SerializedName(value = "coupon_id")
+ private String couponId;
+
+ /**
+ *
+ * 字段名：优惠名称
+ * 变量名：name
+ * 是否必填：否
+ * 类型：string（64）
+ * 描述： 优惠名称
+ * 示例值：单品惠-6
+ *
+ */
+ @SerializedName(value = "name")
+ private String name;
+ /**
+ *
+ * 字段名：优惠范围
+ * 变量名：scope
+ * 是否必填：否
+ * 类型：string（32）
+ * 描述： 优惠名称
+ * 示例值：
+ * GLOBAL：全场代金券
+ * SINGLE：单品优惠
+ * 示例值：GLOBAL
+ *
+ */
+ @SerializedName(value = "scope")
+ private String scope;
+
+ /**
+ *
+ * 字段名：优惠类型
+ * 变量名：type
+ * 是否必填：否
+ * 类型：string（32）
+ * 描述：
+ * CASH：充值
+ * NOCASH：预充值
+ * 示例值：CASH
+ *
+ */
+ @SerializedName(value = "type")
+ private String type;
+
+ /**
+ *
+ * 字段名：优惠券面额
+ * 变量名：amount
+ * 是否必填：是
+ * 类型：int
+ * 描述： 优惠券面额
+ * 示例值：100
+ *
+ */
+ @SerializedName(value = "amount")
+ private Integer amount;
+
+ /**
+ *
+ * 字段名：活动ID
+ * 变量名：stock_id
+ * 是否必填：否
+ * 类型：string（32）
+ * 描述：活动ID
+ * 示例值：931386
+ *
+ */
+ @SerializedName(value = "stock_id")
+ private String stockId;
+
+ /**
+ *
+ * 字段名：微信出资
+ * 变量名：wechatpay_contribute
+ * 是否必填：否
+ * 类型：int
+ * 描述：微信出资，单位为分
+ * 示例值：0
+ *
+ */
+ @SerializedName(value = "wechatpay_contribute")
+ private Integer wechatpayContribute;
+
+ /**
+ *
+ * 字段名：商户出资
+ * 变量名：merchant_contribute
+ * 是否必填：否
+ * 类型：int
+ * 描述：商户出资，单位为分
+ * 示例值：0
+ *
+ */
+ @SerializedName(value = "merchant_contribute")
+ private Integer merchantContribute;
+
+ /**
+ *
+ * 字段名：其他出资
+ * 变量名：other_contribute
+ * 是否必填：否
+ * 类型：int
+ * 描述：其他出资，单位为分
+ * 示例值：0
+ *
+ */
+ @SerializedName(value = "other_contribute")
+ private Integer otherContribute;
+
+ /**
+ *
+ * 字段名：优惠币种
+ * 变量名：currency
+ * 是否必填：否
+ * 类型：String(16)
+ * 描述：
+ * CNY：人民币，境内商户号仅支持人民币。
+ * 示例值：CNY
+ *
+ */
+ @SerializedName(value = "currency")
+ private String currency;
+
+ /**
+ *
+ * 字段名：单品列表
+ * 变量名：goods_detail
+ * 是否必填：否
+ * 类型：array
+ * 描述：单品列表信息
+ *
+ */
+ @SerializedName(value = "goods_detail")
+ private List goodsDetails;
+
+
+ }
+
+ @Data
+ @NoArgsConstructor
+ public static class GoodsDetail implements Serializable {
+
+ /**
+ *
+ * 字段名：商品编码
+ * 变量名：goods_id
+ * 是否必填：是
+ * 类型：string(32)
+ * 描述：商品编码
+ * 示例值：M1006
+ *
+ */
+ @SerializedName(value = "goods_id")
+ private String goodsId;
+
+ /**
+ *
+ * 字段名：商品数量
+ * 变量名：quantity
+ * 是否必填：是
+ * 类型：int64
+ * 描述：
+ * 用户购买的数量
+ * 示例值：1
+ *
+ */
+ @SerializedName(value = "quantity")
+ private Integer quantity;
+
+ /**
+ *
+ * 字段名：商品单价
+ * 变量名：unit_price
+ * 是否必填：是
+ * 类型：int64
+ * 描述：
+ * 商品单价，单位为分
+ * 示例值：100
+ *
+ */
+ @SerializedName(value = "unit_price")
+ private Integer unitPrice;
+
+ /**
+ *
+ * 字段名：商品优惠金额
+ * 变量名：discount_amount
+ * 是否必填：是
+ * 类型：int
+ * 描述：商品优惠金额
+ * 示例值：0
+ *
+ */
+ @SerializedName(value = "discount_amount")
+ private Integer discountAmount;
+
+ /**
+ *
+ * 字段名：商品备注
+ * 变量名：goods_remark
+ * 是否必填：否
+ * 类型：string(128)
+ * 描述：商品备注信息
+ * 示例值：商品备注信息
+ *
+ */
+ @SerializedName(value = "goods_remark")
+ private String goodsRemark;
+ }
+
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java
new file mode 100644
index 0000000000..cbae860439
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/SignatureHeader.java
@@ -0,0 +1,136 @@
+package com.github.binarywang.wxpay.bean.ecommerce;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * 微信通知接口头部信息，需要做签名验证
+ * 文档地址: https://wechatpay-api.gitbook.io/wechatpay-api-v3/qian-ming-zhi-nan-1/qian-ming-yan-zheng
+ *
+ * @author cloudX
+ */
+@Deprecated
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = false)
+@ToString(callSuper = false)
+public class SignatureHeader extends com.github.binarywang.wxpay.bean.notify.SignatureHeader implements Serializable {
+ private static final long serialVersionUID = -6958015499416059949L;
+
+ /**
+ * 已签名字符串
+ */
+ private String signed;
+
+ /**
+ * 证书序列号
+ */
+ private String serialNo;
+
+ /**
+ * 保留在旧类中的序列化字段，避免升级后反序列化旧数据时丢失。
+ */
+ private String timeStamp;
+
+ /**
+ * 保留在旧类中的序列化字段，避免升级后反序列化旧数据时丢失。
+ */
+ private String nonce;
+
+ public SignatureHeader() {
+ super();
+ }
+
+ /**
+ * 保留 4.8.4 及以前版本的构造器签名。
+ */
+ public SignatureHeader(String timeStamp, String nonce, String signed, String serialNo) {
+ setTimeStamp(timeStamp);
+ setNonce(nonce);
+ this.signed = signed;
+ this.serialNo = serialNo;
+ }
+
+ private SignatureHeader(SignatureHeaderBuilder builder) {
+ super(builder);
+ this.timeStamp = builder.timeStamp;
+ this.nonce = builder.nonce;
+ this.signed = builder.signed;
+ this.serialNo = builder.serialNo;
+ }
+
+ @Override
+ public String getTimeStamp() {
+ return this.timeStamp;
+ }
+
+ @Override
+ public void setTimeStamp(String timeStamp) {
+ super.setTimeStamp(timeStamp);
+ this.timeStamp = timeStamp;
+ }
+
+ @Override
+ public String getNonce() {
+ return this.nonce;
+ }
+
+ @Override
+ public void setNonce(String nonce) {
+ super.setNonce(nonce);
+ this.nonce = nonce;
+ }
+
+ /**
+ * 保留旧版 builder 的类型和方法返回值描述符。
+ */
+ public static SignatureHeaderBuilder builder() {
+ return new SignatureHeaderBuilder();
+ }
+
+ public static class SignatureHeaderBuilder extends com.github.binarywang.wxpay.bean.notify.SignatureHeader
+ .SignatureHeaderBuilder {
+ private String timeStamp;
+ private String nonce;
+ private String signed;
+ private String serialNo;
+
+ @Override
+ public SignatureHeaderBuilder timeStamp(String timeStamp) {
+ super.timeStamp(timeStamp);
+ this.timeStamp = timeStamp;
+ return this;
+ }
+
+ @Override
+ public SignatureHeaderBuilder nonce(String nonce) {
+ super.nonce(nonce);
+ this.nonce = nonce;
+ return this;
+ }
+
+ public SignatureHeaderBuilder signed(String signed) {
+ this.signed = signed;
+ return this;
+ }
+
+ public SignatureHeaderBuilder serialNo(String serialNo) {
+ this.serialNo = serialNo;
+ return this;
+ }
+
+ @Override
+ protected SignatureHeaderBuilder self() {
+ return this;
+ }
+
+ @Override
+ public SignatureHeader build() {
+ return new SignatureHeader(this);
+ }
+ }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java
new file mode 100644
index 0000000000..98bf5858e6
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/TransactionsResult.java
@@ -0,0 +1,127 @@
+package com.github.binarywang.wxpay.bean.ecommerce;
+
+import com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum;
+import com.github.binarywang.wxpay.v3.util.SignUtils;
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.security.PrivateKey;
+
+/**
+ * 合单支付 JSAPI支付结果响应
+ */
+@Data
+@NoArgsConstructor
+@Deprecated
+public class TransactionsResult implements Serializable {
+ private static final long serialVersionUID = 1760592667519950149L;
+ /**
+ *
+ * 字段名：预支付交易会话标识 （APP支付、JSAPI支付 会返回）
+ * 变量名：prepay_id
+ * 是否必填：是
+ * 类型：string(64)
+ * 描述：
+ * 数字和字母。微信生成的预支付会话标识，用于后续接口调用使用。
+ * 示例值：wx201410272009395522657a690389285100
+ *
+ */
+ @SerializedName("prepay_id")
+ private String prepayId;
+
+ /**
+ *
+ * 字段名：支付跳转链接 （H5支付 会返回）
+ * 变量名：h5_url
+ * 是否必填：是
+ * 类型：string(512)
+ * 描述：
+ * 支付跳转链接
+ * 示例值：https://wx.tenpay.com/cgi-bin/mmpayweb-bin/checkmweb?prepay_id=wx2016121516420242444321ca0631331346&package=1405458241
+ *
+ */
+ @SerializedName("h5_url")
+ private String h5Url;
+
+ /**
+ *
+ * 字段名：二维码链接 （NATIVE支付 会返回）
+ * 变量名：h5_url
+ * 是否必填：是
+ * 类型：string(512)
+ * 描述：
+ * 二维码链接
+ * 示例值：weixin://pay.weixin.qq.com/bizpayurl/up?pr=NwY5Mz9&groupid=00
+ *
+ */
+ @SerializedName("code_url")
+ private String codeUrl;
+
+ @Data
+ @Accessors(chain = true)
+ public static class JsapiResult implements Serializable {
+ private String appId;
+ private String timeStamp;
+ private String nonceStr;
+ /**
+ * 由于package为java保留关键字，因此改为packageValue，序列化时会自动转换为package字段名
+ */
+ @SerializedName("package")
+ private String packageValue;
+ private String signType;
+ private String paySign;
+
+ private String getSignStr() {
+ return String.format("%s\n%s\n%s\n%s\n", appId, timeStamp, nonceStr, packageValue);
+ }
+ }
+
+ @Data
+ @Accessors(chain = true)
+ public static class AppResult implements Serializable {
+ private String appid;
+ private String partnerid;
+ private String prepayid;
+ /**
+ * 由于package为java保留关键字，因此改为packageValue，序列化时会自动转换为package字段名
+ */
+ @SerializedName("package")
+ private String packageValue;
+ private String noncestr;
+ private String timestamp;
+ private String sign;
+
+ private String getSignStr() {
+ return String.format("%s\n%s\n%s\n%s\n", appid, timestamp, noncestr, prepayid);
+ }
+ }
+
+ public T getPayInfo(TradeTypeEnum tradeType, String appId, String mchId, PrivateKey privateKey) {
+ String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
+ String nonceStr = SignUtils.genRandomStr();
+ switch (tradeType) {
+ case JSAPI:
+ JsapiResult jsapiResult = new JsapiResult();
+ jsapiResult.setAppId(appId).setTimeStamp(timestamp)
+ .setPackageValue("prepay_id=" + this.prepayId).setNonceStr(nonceStr)
+ //签名类型，默认为RSA，仅支持RSA。
+ .setSignType("RSA").setPaySign(SignUtils.sign(jsapiResult.getSignStr(), privateKey));
+ return (T) jsapiResult;
+ case MWEB:
+ return (T) this.h5Url;
+ case APP:
+ AppResult appResult = new AppResult();
+ appResult.setAppid(appId).setPrepayid(this.prepayId).setPartnerid(mchId)
+ .setNoncestr(nonceStr).setTimestamp(timestamp)
+ //暂填写固定值Sign=WXPay
+ .setPackageValue("Sign=WXPay").setSign(SignUtils.sign(appResult.getSignStr(), privateKey));
+ return (T) appResult;
+ case NATIVE:
+ return (T) this.codeUrl;
+ }
+ return null;
+ }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java
new file mode 100644
index 0000000000..5514dc22fc
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/enums/TradeTypeEnum.java
@@ -0,0 +1,38 @@
+package com.github.binarywang.wxpay.bean.ecommerce.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 支付方式
+ */
+@Getter
+@AllArgsConstructor
+@Deprecated
+public enum TradeTypeEnum {
+ /**
+ * APP
+ */
+ APP("/v3/combine-transactions/app", "/v3/pay/partner/transactions/app"),
+ /**
+ * JSAPI
+ */
+ JSAPI("/v3/combine-transactions/jsapi", "/v3/pay/partner/transactions/jsapi"),
+ /**
+ * NATIVE
+ */
+ NATIVE("/v3/combine-transactions/native", "/v3/pay/partner/transactions/native"),
+ /**
+ * MWEB
+ */
+ MWEB("/v3/combine-transactions/h5", "/v3/pay/partner/transactions/h5");
+
+ /**
+ * 合单url
+ */
+ private final String combineUrl;
+ /**
+ * 单独下单url
+ */
+ private final String partnerUrl;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/goldplan/GoldPlanResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/goldplan/GoldPlanResult.java
new file mode 100644
index 0000000000..9ab72f917a
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/goldplan/GoldPlanResult.java
@@ -0,0 +1,22 @@
+package com.github.binarywang.wxpay.bean.goldplan;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 点金计划操作结果
+ *
+ * @author zhangyl
+ */
+@Data
+public class GoldPlanResult implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 特约商户号
+ */
+ @SerializedName("sub_mchid")
+ private String subMchId;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/invoice/PassengerTransportInvoiceRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/invoice/PassengerTransportInvoiceRequest.java
new file mode 100644
index 0000000000..a1eebcffc1
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/invoice/PassengerTransportInvoiceRequest.java
@@ -0,0 +1,285 @@
+package com.github.binarywang.wxpay.bean.invoice;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 服务商开具旅客运输行业电子发票请求。
+ *
+ * 购买方手机号、邮箱以及出行人证件号码由调用方按微信支付文档加密。
+ *
+ * @see 开具旅客运输行业电子发票
+ */
+@Data
+public class PassengerTransportInvoiceRequest implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 子商户号。微信支付分配的子商户号，必填，最长32个字符。
+ */
+ @SerializedName("sub_mchid")
+ private String subMchid;
+
+ /**
+ * 发票申请单号。唯一标识一次开票行为并关联唯一的购买方信息，必填，最长32个字符；
+ * 微信支付账单开票场景下填写微信支付交易单号。
+ */
+ @SerializedName("fapiao_apply_id")
+ private String fapiaoApplyId;
+
+ /**
+ * 购买方信息，即发票抬头，必填。
+ */
+ @SerializedName("buyer_information")
+ private BuyerInformation buyerInformation;
+
+ /**
+ * 需要开具的旅客运输行业数电发票信息，必填。
+ */
+ @SerializedName("fapiao_information")
+ private FapiaoInformation fapiaoInformation;
+
+ /**
+ * 需要开具的旅客运输行业数电发票信息。
+ */
+ @Data
+ public static class FapiaoInformation implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 商户发票单号，必填，最长32个字符，在每个商户下必须唯一。
+ * 仅支持字母、数字、中划线、下划线、竖线和星号；开票失败或发票已冲红时可更换后重试，
+ * 同一发票申请单最多支持5个商户发票单号。
+ */
+ @SerializedName("fapiao_id")
+ private String fapiaoId;
+
+ /**
+ * 总价税合计，必填，单位：分。值为所有发票行单行金额合计之和，且全部发票的总价税合计
+ * 不能超过交易总金额。
+ */
+ @SerializedName("total_amount")
+ private Long totalAmount;
+
+ /**
+ * 发票行信息，必填；单张发票最多包含8行。
+ */
+ private List items;
+
+ /**
+ * 出口业务适用政策代码。可选值：1（退税政策）、2（免税政策）、3（征税政策）。
+ */
+ @SerializedName("export_business_policy_code")
+ private Long exportBusinessPolicyCode;
+
+ /**
+ * 增值税即征即退代码。可选值：1（软件产品）、2（资源综合利用产品）、3（管道运输服务）、
+ * 4（有形动产融资租赁服务）、5（有形动产融资性售后回租服务）、6（新型墙体材料）、
+ * 7（风力发电产品）、8（光伏发电产品）、9（动漫软件产品）、10（飞机维修劳务）、
+ * 11（黄金）、12（铂金）。
+ */
+ @SerializedName("vat_refund_levy_code")
+ private Long vatRefundLevyCode;
+
+ /**
+ * 开票人ID，必填，最长64个字符，为税局乐企系统登记的开票人ID。
+ */
+ @SerializedName("billing_person_id")
+ private String billingPersonId;
+
+ /**
+ * 开票人名称，最长64个字符，为税局乐企系统登记的脱敏后名称；格式为脱敏姓名、空格和身份证后四位。
+ */
+ @SerializedName("billing_person")
+ private String billingPerson;
+
+ /**
+ * 发票类型，必填。可选值：COMM_FAPIAO（增值税普通发票）、VAT_FAPIAO（增值税专用发票）。
+ */
+ @SerializedName("fapiao_bill_type")
+ private String fapiaoBillType;
+
+ /**
+ * 发票对应的交易信息，必填，最多支持10条。
+ */
+ @SerializedName("transaction_information")
+ private List transactionInformation;
+
+ /**
+ * 发票备注。
+ */
+ private String remark;
+ }
+
+ /**
+ * 发票行信息。
+ */
+ @Data
+ public static class InvoiceItem implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 税局侧规定的货物或应税劳务、服务税收分类编码，必填，长度为19个字符；
+ * 旅客运输业务仅支持以301开头的税收分类编码。
+ */
+ @SerializedName("tax_code")
+ private String taxCode;
+
+ /**
+ * 货物或应税劳务、服务名称，必填，由商户自定义，最长128个字符。
+ */
+ @SerializedName("goods_name")
+ private String goodsName;
+
+ /**
+ * 规格型号，展示在发票规格型号列，最长20个字符。
+ */
+ private String specification;
+
+ /**
+ * 单位，展示在发票单位列；折扣行不填写。
+ */
+ private String unit;
+
+ /**
+ * 数量，单位为10的负8次方，100000000表示数量1。非折扣行不填写时默认为100000000；
+ * 折扣行不填写。
+ */
+ private Long quantity;
+
+ /**
+ * 单行金额合计，必填，单位：分。折扣行为负数，非折扣行为正数。
+ */
+ @SerializedName("total_amount")
+ private Long totalAmount;
+
+ /**
+ * 税率，必填，单位为万分之一，例如1300表示13%。当前支持0、1%、1.5%、3%、5%、6%、
+ * 9%、10%、11%、13%、16%和17%。
+ */
+ @SerializedName("tax_rate")
+ private Long taxRate;
+
+ /**
+ * 是否为折扣行，必填；折扣行必须紧跟在被折扣行之后。
+ */
+ private Boolean discount;
+
+ /**
+ * 优惠政策标识。可选值：1（简易征收）、2（稀土产品）、3（免税）、4（不征税）、
+ * 5（先征后退）、6（100%先征后退）、7（50%先征后退）、8（按3%简易征收）、
+ * 9（按5%简易征收）、10（按5%简易征收减按1.5%计征）、11（即征即退30%）、
+ * 12（即征即退50%）、13（即征即退70%）、14（即征即退100%）、
+ * 15（超税负3%即征即退）、16（超税负8%即征即退）、17（超税负12%即征即退）、
+ * 18（超税负6%即征即退）。
+ */
+ @SerializedName("preferential_policy_code")
+ private Long preferentialPolicyCode;
+
+ /**
+ * 出行人额外信息，可选；传入时其内部必填字段必须完整填写。
+ */
+ @SerializedName("passenger_information")
+ private PassengerInformation passengerInformation;
+ }
+
+ /**
+ * 出行人额外信息。证件号码由调用方按微信支付文档加密。
+ */
+ @Data
+ public static class PassengerInformation implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 出行人姓名；填写出行人额外信息时必填，最长20个字符。
+ */
+ private String name;
+
+ /**
+ * 出行人证件类型；填写出行人额外信息时必填。可选值：IDENTITY_CARD（居民身份证）、
+ * PASSPORT（护照）、HONG_KONG_PERMIT（中国香港居民来往内地通行证）、
+ * MACAO_PERMIT（中国澳门居民来往内地通行证）、TAIWAN_PERMIT（中国台湾居民来往大陆通行证）、
+ * FOREIGNER_RESIDENCE_PERMIT（外国人居留证）、HONG_KONG_RESIDENT_CARD（香港居民证）、
+ * MACAO_RESIDENT_CARD（澳门居民证）、TAIWAN_RESIDENT_CARD（台湾居民证）、
+ * MILITARY_OFFICER_CARD（军官证）、ARMED_POLICE_OFFICER_CARD（武警警官证）、
+ * SOLDIER_CARD（士兵证）、HOMECOMING_CERT（港澳同胞回乡证）、
+ * TAIWAN_COMPATRIOT_CERT（台胞证）。
+ */
+ @SerializedName("certificate_type")
+ private String certificateType;
+
+ /**
+ * 出行人证件号码；填写出行人额外信息时必填。该字段为密文字段，调用方需使用微信支付公钥
+ * 或微信支付平台证书公钥加密后传入。
+ */
+ @SerializedName("certificate_number")
+ private String certificateNumber;
+
+ /**
+ * 出行日期；填写出行人额外信息时必填，使用 RFC3339 格式：yyyy-MM-DDTHH:mm:ss+TIMEZONE。
+ */
+ @SerializedName("departure_date")
+ private String departureDate;
+
+ /**
+ * 出发地详细地址；填写出行人额外信息时必填，最长80个字符。
+ */
+ @SerializedName("departure_place")
+ private String departurePlace;
+
+ /**
+ * 目的地详细地址；填写出行人额外信息时必填，最长80个字符。
+ */
+ private String destination;
+
+ /**
+ * 交通工具类型；填写出行人额外信息时必填。可选值：LONG_DISTANCE_BUS（长途汽车）、
+ * PUBLIC_TRANSPORTATION（公共交通）、CAR（汽车）、SHIP（船舶）、
+ * OTHER_TRANSPORTATION（其他交通工具）。
+ */
+ @SerializedName("transportation_type")
+ private String transportationType;
+
+ /**
+ * 交通工具等级。交通工具为 SHIP 时必填，可选值：SHIP_FIRST_CLASS_CABIN（船舶一等舱）、
+ * SHIP_SECOND_CLASS_CABIN（船舶二等舱）、SHIP_THIRD_CLASS_CABIN（船舶三等舱）；
+ * 其他交通工具不填写。
+ */
+ @SerializedName("transportation_classes")
+ private String transportationClasses;
+ }
+
+ /**
+ * 发票对应的交易信息。
+ */
+ @Data
+ public static class TransactionInformation implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 支付渠道，必填。当前可选值：WECHAT_PAY（微信支付）。
+ */
+ @SerializedName("pay_channel")
+ private String payChannel;
+
+ /**
+ * 支付订单号，最长64个字符。支付渠道为 WECHAT_PAY 时，本字段与商户订单号至少填写一个。
+ */
+ @SerializedName("transaction_id")
+ private String transactionId;
+
+ /**
+ * 支付商户订单号，最长64个字符。支付渠道为 WECHAT_PAY 时，本字段与支付订单号至少填写一个。
+ */
+ @SerializedName("out_trade_no")
+ private String outTradeNo;
+
+ /**
+ * 交易金额，必填，单位：分。
+ */
+ private Long amount;
+ }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/SignatureHeader.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/SignatureHeader.java
index cd1fbc42dc..1381759fd9 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/SignatureHeader.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/SignatureHeader.java
@@ -1,9 +1,9 @@
package com.github.binarywang.wxpay.bean.notify;
import lombok.AllArgsConstructor;
-import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
import java.io.Serializable;
@@ -14,7 +14,7 @@
* @author thinstar
*/
@Data
-@Builder
+@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class SignatureHeader implements Serializable {
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
index 5ef94e531d..997a6689da 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/EcommerceService.java
@@ -13,6 +13,7 @@
import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
import com.github.binarywang.wxpay.exception.WxPayException;
+import com.google.gson.Gson;
import java.io.File;
import java.io.IOException;
@@ -28,6 +29,114 @@
* created on 2020 /08/17
*/
public interface EcommerceService {
+ Gson LEGACY_ECOMMERCE_GSON = new Gson();
+
+ /**
+ * @deprecated 从 4.8.5.B 起，请改用 {@link #combine(TradeTypeEnum, com.github.binarywang.wxpay.bean.request.CombineTransactionsRequest)}；5.0 将移除该兼容入口。
+ */
+ @Deprecated
+ default com.github.binarywang.wxpay.bean.ecommerce.TransactionsResult combine(
+ com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum tradeType,
+ com.github.binarywang.wxpay.bean.ecommerce.CombineTransactionsRequest request) throws WxPayException {
+ com.github.binarywang.wxpay.bean.request.CombineTransactionsRequest unifiedRequest =
+ LEGACY_ECOMMERCE_GSON.fromJson(LEGACY_ECOMMERCE_GSON.toJson(request),
+ com.github.binarywang.wxpay.bean.request.CombineTransactionsRequest.class);
+ CombineTransactionsResult unifiedResult = combine(toUnifiedTradeType(tradeType), unifiedRequest);
+ return LEGACY_ECOMMERCE_GSON.fromJson(LEGACY_ECOMMERCE_GSON.toJson(unifiedResult),
+ com.github.binarywang.wxpay.bean.ecommerce.TransactionsResult.class);
+ }
+
+ /** @deprecated 从 4.8.5.B 起，请改用使用统一请求模型的同名方法；5.0 将移除该兼容入口。 */
+ @Deprecated
+ default T combineTransactions(com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum tradeType,
+ com.github.binarywang.wxpay.bean.ecommerce.CombineTransactionsRequest request) throws WxPayException {
+ return combineTransactions(toUnifiedTradeType(tradeType), LEGACY_ECOMMERCE_GSON.fromJson(LEGACY_ECOMMERCE_GSON.toJson(request),
+ com.github.binarywang.wxpay.bean.request.CombineTransactionsRequest.class));
+ }
+
+ /** @deprecated 从 4.8.5.B 起，请改用 {@link #parseCombineNotifyResult(String, SignatureHeader)}；5.0 将移除。 */
+ @Deprecated
+ default com.github.binarywang.wxpay.bean.ecommerce.CombineTransactionsNotifyResult parseCombineNotifyResult(String notifyData,
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader header) throws WxPayException {
+ CombineNotifyResult result = parseCombineNotifyResult(notifyData, toUnifiedSignatureHeader(header));
+ return LEGACY_ECOMMERCE_GSON.fromJson(LEGACY_ECOMMERCE_GSON.toJson(result),
+ com.github.binarywang.wxpay.bean.ecommerce.CombineTransactionsNotifyResult.class);
+ }
+
+ /** @deprecated 从 4.8.5.B 起，请改用 {@link #queryCombine(String)}；5.0 将移除。 */
+ @Deprecated
+ default com.github.binarywang.wxpay.bean.ecommerce.CombineTransactionsResult queryCombineTransactions(String outTradeNo) throws WxPayException {
+ return LEGACY_ECOMMERCE_GSON.fromJson(LEGACY_ECOMMERCE_GSON.toJson(queryCombine(outTradeNo)),
+ com.github.binarywang.wxpay.bean.ecommerce.CombineTransactionsResult.class);
+ }
+
+ /** @deprecated 从 4.8.5.B 起，请改用 {@link #unifiedPartnerOrder(TradeTypeEnum, WxPayPartnerUnifiedOrderV3Request)}；5.0 将移除。 */
+ @Deprecated
+ default com.github.binarywang.wxpay.bean.ecommerce.TransactionsResult partner(
+ com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum tradeType,
+ com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsRequest request) throws WxPayException {
+ WxPayUnifiedOrderV3Result result = unifiedPartnerOrder(toUnifiedTradeType(tradeType), LEGACY_ECOMMERCE_GSON.fromJson(
+ LEGACY_ECOMMERCE_GSON.toJson(request), WxPayPartnerUnifiedOrderV3Request.class));
+ return LEGACY_ECOMMERCE_GSON.fromJson(LEGACY_ECOMMERCE_GSON.toJson(result),
+ com.github.binarywang.wxpay.bean.ecommerce.TransactionsResult.class);
+ }
+
+ /** @deprecated 从 4.8.5.B 起，请改用 {@link #createPartnerOrder(TradeTypeEnum, WxPayPartnerUnifiedOrderV3Request)}；5.0 将移除。 */
+ @Deprecated
+ default T partnerTransactions(com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum tradeType,
+ com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsRequest request) throws WxPayException {
+ return createPartnerOrder(toUnifiedTradeType(tradeType), LEGACY_ECOMMERCE_GSON.fromJson(LEGACY_ECOMMERCE_GSON.toJson(request),
+ WxPayPartnerUnifiedOrderV3Request.class));
+ }
+
+ /** @deprecated 从 4.8.5.B 起，请改用使用 {@link SignatureHeader} 的同名方法；5.0 将移除。 */
+ @Deprecated
+ default com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsNotifyResult parsePartnerNotifyResult(String notifyData,
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader header) throws WxPayException {
+ return LEGACY_ECOMMERCE_GSON.fromJson(LEGACY_ECOMMERCE_GSON.toJson(parsePartnerNotifyResult(notifyData, toUnifiedSignatureHeader(header))),
+ com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsNotifyResult.class);
+ }
+
+ /** @deprecated 从 4.8.5.B 起，请改用 {@link #queryPartnerOrder(WxPayPartnerOrderQueryV3Request)}；5.0 将移除。 */
+ @Deprecated
+ default com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsResult queryPartnerTransactions(
+ com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsQueryRequest request) throws WxPayException {
+ return LEGACY_ECOMMERCE_GSON.fromJson(LEGACY_ECOMMERCE_GSON.toJson(queryPartnerOrder(LEGACY_ECOMMERCE_GSON.fromJson(
+ LEGACY_ECOMMERCE_GSON.toJson(request), WxPayPartnerOrderQueryV3Request.class))),
+ com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsResult.class);
+ }
+
+ /** @deprecated 从 4.8.5.B 起，请改用 {@link #closePartnerOrder(WxPayPartnerOrderCloseV3Request)}；5.0 将移除。 */
+ @Deprecated
+ default String closePartnerTransactions(com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsCloseRequest request) throws WxPayException {
+ closePartnerOrder(toUnifiedPartnerOrderCloseRequest(request));
+ return null;
+ }
+
+ static TradeTypeEnum toUnifiedTradeType(com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum tradeType) {
+ return tradeType == com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum.MWEB ? TradeTypeEnum.H5 : TradeTypeEnum.valueOf(tradeType.name());
+ }
+
+ static SignatureHeader toUnifiedSignatureHeader(com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader header) {
+ return header == null ? null : SignatureHeader.builder().timeStamp(header.getTimeStamp()).nonce(header.getNonce())
+ .signature(header.getSigned()).serial(header.getSerialNo()).build();
+ }
+
+ /**
+ * 旧电商关闭请求转统一模型。
+ * {@code outTradeNo} 在两侧均为 path 参数（{@code transient}），不能走 Gson 往返，否则会丢失。
+ */
+ static WxPayPartnerOrderCloseV3Request toUnifiedPartnerOrderCloseRequest(
+ com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsCloseRequest request) {
+ if (request == null) {
+ return null;
+ }
+ return new WxPayPartnerOrderCloseV3Request()
+ .setSpMchId(request.getSpMchid())
+ .setSubMchId(request.getSubMchid())
+ .setOutTradeNo(request.getOutTradeNo());
+ }
+
/**
*
* 二级商户进件API
@@ -80,7 +189,8 @@ public interface EcommerceService {
* @return 微信合单支付返回 CombineTransactionsResult
* @throws WxPayException the wx pay exception
*/
- CombineTransactionsResult combine(TradeTypeEnum tradeType, CombineTransactionsRequest request) throws WxPayException;
+ CombineTransactionsResult combine(TradeTypeEnum tradeType,
+ com.github.binarywang.wxpay.bean.request.CombineTransactionsRequest request) throws WxPayException;
/**
*
@@ -95,7 +205,8 @@ public interface EcommerceService {
* @return 调起支付需要的参数 t
* @throws WxPayException the wx pay exception
*/
- T combineTransactions(TradeTypeEnum tradeType, CombineTransactionsRequest request) throws WxPayException;
+ T combineTransactions(TradeTypeEnum tradeType,
+ com.github.binarywang.wxpay.bean.request.CombineTransactionsRequest request) throws WxPayException;
/**
*
@@ -436,6 +547,15 @@ public interface EcommerceService {
*/
RefundNotifyResult parseRefundNotifyResult(String notifyData, SignatureHeader header) throws WxPayException;
+ /**
+ * @deprecated 从 4.8.5.B 起，请改用使用 {@link SignatureHeader} 的同名方法；5.0 将移除。
+ */
+ @Deprecated
+ default RefundNotifyResult parseRefundNotifyResult(String notifyData,
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader header) throws WxPayException {
+ return parseRefundNotifyResult(notifyData, toUnifiedSignatureHeader(header));
+ }
+
/**
*
* 提现状态变更通知回调数据处理
@@ -449,6 +569,15 @@ public interface EcommerceService {
*/
WithdrawNotifyResult parseWithdrawNotifyResult(String notifyData, SignatureHeader header) throws WxPayException;
+ /**
+ * @deprecated 从 4.8.5.B 起，请改用使用 {@link SignatureHeader} 的同名方法；5.0 将移除。
+ */
+ @Deprecated
+ default WithdrawNotifyResult parseWithdrawNotifyResult(String notifyData,
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader header) throws WxPayException {
+ return parseWithdrawNotifyResult(notifyData, toUnifiedSignatureHeader(header));
+ }
+
/**
*
* 二级商户账户余额提现API
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/GoldPlanService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/GoldPlanService.java
new file mode 100644
index 0000000000..a02e7b21df
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/GoldPlanService.java
@@ -0,0 +1,104 @@
+package com.github.binarywang.wxpay.service;
+
+import com.github.binarywang.wxpay.bean.goldplan.GoldPlanResult;
+import com.github.binarywang.wxpay.exception.WxPayException;
+
+import java.util.List;
+
+/**
+ * 点金计划 接口
+ *
+ * 产品介绍
+ *
+ *
+ * @author zhangyl
+ * @since 2026-08-22
+ */
+public interface GoldPlanService {
+
+ /**
+ * 为特约商户开通点金计划
+ *
+ * 接口文档
+ *
+ *
+ * @param subMchId 特约商户号
+ * @param operationPayScene 支付场景，可选值为JSAPI_AND_MINIPROGRAM、JSAPI、MINIPROGRAM；不传时默认为JSAPI
+ * @return 点金计划操作结果
+ * @throws WxPayException 微信支付请求异常
+ */
+ GoldPlanResult openGoldPlan(String subMchId, String operationPayScene) throws WxPayException;
+
+ /**
+ * 为特约商户关闭点金计划
+ *
+ * 接口文档
+ *
+ *
+ * @param subMchId 特约商户号
+ * @param operationPayScene 支付场景，可选值为JSAPI_AND_MINIPROGRAM、JSAPI、MINIPROGRAM；不传时默认为JSAPI
+ * @return 点金计划操作结果
+ * @throws WxPayException 微信支付请求异常
+ */
+ GoldPlanResult closeGoldPlan(String subMchId, String operationPayScene) throws WxPayException;
+
+ /**
+ * 为特约商户开通商家小票
+ *
+ * 接口文档
+ *
+ *
+ * @param subMchId 特约商户号
+ * @return 商家小票操作结果
+ * @throws WxPayException 微信支付请求异常
+ */
+ GoldPlanResult openCustomPage(String subMchId) throws WxPayException;
+
+ /**
+ * 为特约商户关闭商家小票
+ *
+ * 接口文档
+ *
+ *
+ * @param subMchId 特约商户号
+ * @return 商家小票操作结果
+ * @throws WxPayException 微信支付请求异常
+ */
+ GoldPlanResult closeCustomPage(String subMchId) throws WxPayException;
+
+ /**
+ * 设置特约商户的点金计划同业过滤标签
+ *
+ * 接口文档
+ *
+ *
+ * @param subMchId 特约商户号
+ * @param advertisingIndustryFilters 同业过滤标签，最少一个，最多三个
+ * @throws WxPayException 微信支付请求异常
+ */
+ void setAdvertisingIndustryFilter(String subMchId, List advertisingIndustryFilters) throws WxPayException;
+
+ /**
+ * 为特约商户的点金计划页面开通广告展示
+ *
+ * 接口文档
+ *
+ *
+ * @param subMchId 特约商户号
+ * @param advertisingIndustryFilters 同业过滤标签，可选，最多三个
+ * @throws WxPayException 微信支付请求异常
+ */
+ void openAdvertisingShow(String subMchId, List advertisingIndustryFilters) throws WxPayException;
+
+ /**
+ * 为特约商户的点金计划页面关闭广告展示
+ *
+ * 接口文档
+ *
+ *
+ * @param subMchId 特约商户号
+ * @throws WxPayException 微信支付请求异常
+ */
+ void closeAdvertisingShow(String subMchId) throws WxPayException;
+
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PartnerInvoiceService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PartnerInvoiceService.java
index 39390ba713..a504b00005 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PartnerInvoiceService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PartnerInvoiceService.java
@@ -3,6 +3,7 @@
import com.github.binarywang.wxpay.bean.invoice.InviteUrlResult;
import com.github.binarywang.wxpay.bean.invoice.InviteUrlRequest;
import com.github.binarywang.wxpay.bean.invoice.GeneralInvoiceRequest;
+import com.github.binarywang.wxpay.bean.invoice.PassengerTransportInvoiceRequest;
import com.github.binarywang.wxpay.bean.invoice.InvoiceResult;
import com.github.binarywang.wxpay.bean.invoice.InvoiceFileResult;
import com.github.binarywang.wxpay.bean.invoice.ReverseInvoiceRequest;
@@ -51,6 +52,21 @@ public interface PartnerInvoiceService {
*/
void issueGeneralInvoice(GeneralInvoiceRequest request) throws WxPayException;
+ /**
+ * 开具旅客运输行业电子发票。
+ *
+ * 接口受理成功时返回 HTTP 202 Accepted，无应答包体。受理成功不代表开票完成，
+ * 请通过开票结果回调或查询电子发票接口获取处理结果。
+ *
+ * @param request 开票申请
+ * @throws WxPayException 微信支付异常
+ * @throws UnsupportedOperationException 当前实现不支持开具旅客运输行业电子发票
+ * @see 官方文档
+ */
+ default void issuePassengerTransportInvoice(PassengerTransportInvoiceRequest request) throws WxPayException {
+ throw new UnsupportedOperationException("当前实现不支持开具旅客运输行业电子发票");
+ }
+
/**
* 查询电子发票。
*
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
index 2aec711831..d0d43285da 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
@@ -408,6 +408,13 @@ default WxPayService switchoverTo(String mchIdOrConfigKey) {
*/
MerchantLimitationService getMerchantLimitationService();
+ /**
+ * 获取点金计划服务类
+ *
+ * @return 点金计划服务
+ */
+ GoldPlanService getGoldPlanService();
+
/**
* 获取服务商电子发票服务类。
*
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index d17c3ae698..18e9b05b1a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -148,6 +148,9 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
@Getter
private final MerchantLimitationService merchantLimitationService = new MerchantLimitationServiceImpl(this);
+ @Getter
+ private final GoldPlanService goldPlanService = new GoldPlanServiceImpl(this);
+
@Getter
private final PartnerInvoiceService partnerInvoiceService = new PartnerInvoiceServiceImpl(this);
@@ -368,14 +371,17 @@ public String getConfigKey(String mchId, String appId) {
@Override
public String getPayBaseUrl() {
if (this.getConfig().isUseSandboxEnv()) {
- if (StringUtils.isNotBlank(this.getConfig().getApiV3Key())) {
- throw new WxRuntimeException("微信支付V3 目前不支持沙箱模式！");
- }
return this.getConfig().getApiHostWithPathPrefix() + "/xdc/apiv2sandbox";
}
return this.getConfig().getApiHostWithPathPrefix();
}
+ protected void checkV3SandboxNotSupported() {
+ if (this.getConfig().isUseSandboxEnv()) {
+ throw new WxRuntimeException("微信支付V3 目前不支持沙箱模式！");
+ }
+ }
+
@Override
public WxPayRefundResult refund(WxPayRefundRequest request) throws WxPayException {
request.checkAndSign(this.getConfig());
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
index 0f99d428fc..605ff78be5 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
@@ -70,12 +70,14 @@ public ApplymentsStatusResult queryApplyStatusByOutRequestNo(String outRequestNo
}
@Override
- public CombineTransactionsResult combine(TradeTypeEnum tradeType, CombineTransactionsRequest request) throws WxPayException {
+ public CombineTransactionsResult combine(TradeTypeEnum tradeType,
+ com.github.binarywang.wxpay.bean.request.CombineTransactionsRequest request) throws WxPayException {
return this.payService.combine(tradeType, request);
}
@Override
- public T combineTransactions(TradeTypeEnum tradeType, CombineTransactionsRequest request) throws WxPayException {
+ public T combineTransactions(TradeTypeEnum tradeType,
+ com.github.binarywang.wxpay.bean.request.CombineTransactionsRequest request) throws WxPayException {
return this.payService.combineTransactions(tradeType, request);
}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/GoldPlanServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/GoldPlanServiceImpl.java
new file mode 100644
index 0000000000..801ed6a266
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/GoldPlanServiceImpl.java
@@ -0,0 +1,113 @@
+package com.github.binarywang.wxpay.service.impl;
+
+import com.github.binarywang.wxpay.bean.goldplan.GoldPlanResult;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.GoldPlanService;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import lombok.RequiredArgsConstructor;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 点金计划 接口实现
+ *
+ * @author zhangyl
+ * @since 2026-08-22
+ */
+@RequiredArgsConstructor
+public class GoldPlanServiceImpl implements GoldPlanService {
+ private static final Gson GSON = new GsonBuilder().create();
+ private static final String OPEN = "OPEN";
+ private static final String CLOSE = "CLOSE";
+
+ private final WxPayService payService;
+
+ @Override
+ public GoldPlanResult openGoldPlan(String subMchId, String operationPayScene) throws WxPayException {
+ return changeGoldPlanStatus(subMchId, OPEN, operationPayScene);
+ }
+
+ /**
+ * 调用微信支付接口开通或关闭点金计划
+ *
+ * @param subMchId 特约商户号
+ * @param operationType 操作类型
+ * @param operationPayScene 支付场景
+ * @return 点金计划操作结果
+ * @throws WxPayException 微信支付请求异常
+ */
+ private GoldPlanResult changeGoldPlanStatus(String subMchId, String operationType,
+ String operationPayScene) throws WxPayException {
+ String url = String.format("%s/v3/goldplan/merchants/changegoldplanstatus", this.payService.getPayBaseUrl());
+ Map request = new HashMap<>(4);
+ request.put("sub_mchid", subMchId);
+ request.put("operation_type", operationType);
+ request.put("operation_pay_scene", operationPayScene);
+ String result = this.payService.postV3(url, GSON.toJson(request));
+ return GSON.fromJson(result, GoldPlanResult.class);
+ }
+
+ @Override
+ public GoldPlanResult closeGoldPlan(String subMchId, String operationPayScene) throws WxPayException {
+ return changeGoldPlanStatus(subMchId, CLOSE, operationPayScene);
+ }
+
+ @Override
+ public GoldPlanResult openCustomPage(String subMchId) throws WxPayException {
+ return changeCustomPageStatus(subMchId, OPEN);
+ }
+
+ /**
+ * 调用微信支付接口开通或关闭商家小票
+ *
+ * @param subMchId 特约商户号
+ * @param operationType 操作类型
+ * @return 商家小票操作结果
+ * @throws WxPayException 微信支付请求异常
+ */
+ private GoldPlanResult changeCustomPageStatus(String subMchId, String operationType) throws WxPayException {
+ String url = String.format("%s/v3/goldplan/merchants/changecustompagestatus", this.payService.getPayBaseUrl());
+ Map request = new HashMap<>(2);
+ request.put("sub_mchid", subMchId);
+ request.put("operation_type", operationType);
+ String result = this.payService.postV3(url, GSON.toJson(request));
+ return GSON.fromJson(result, GoldPlanResult.class);
+ }
+
+ @Override
+ public GoldPlanResult closeCustomPage(String subMchId) throws WxPayException {
+ return changeCustomPageStatus(subMchId, CLOSE);
+ }
+
+ @Override
+ public void setAdvertisingIndustryFilter(String subMchId, List advertisingIndustryFilters)
+ throws WxPayException {
+ String url = String.format("%s/v3/goldplan/merchants/set-advertising-industry-filter",
+ this.payService.getPayBaseUrl());
+ Map request = new HashMap<>(2);
+ request.put("sub_mchid", subMchId);
+ request.put("advertising_industry_filters", advertisingIndustryFilters);
+ this.payService.postV3(url, GSON.toJson(request));
+ }
+
+ @Override
+ public void openAdvertisingShow(String subMchId, List advertisingIndustryFilters) throws WxPayException {
+ String url = String.format("%s/v3/goldplan/merchants/open-advertising-show", this.payService.getPayBaseUrl());
+ Map request = new HashMap<>(2);
+ request.put("sub_mchid", subMchId);
+ request.put("advertising_industry_filters", advertisingIndustryFilters);
+ this.payService.patchV3(url, GSON.toJson(request));
+ }
+
+ @Override
+ public void closeAdvertisingShow(String subMchId) throws WxPayException {
+ String url = String.format("%s/v3/goldplan/merchants/close-advertising-show", this.payService.getPayBaseUrl());
+ Map request = new HashMap<>(1);
+ request.put("sub_mchid", subMchId);
+ this.payService.postV3(url, GSON.toJson(request));
+ }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PartnerInvoiceServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PartnerInvoiceServiceImpl.java
index af173851f1..c51f8006e4 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PartnerInvoiceServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PartnerInvoiceServiceImpl.java
@@ -3,6 +3,7 @@
import com.github.binarywang.wxpay.bean.invoice.InviteUrlResult;
import com.github.binarywang.wxpay.bean.invoice.InviteUrlRequest;
import com.github.binarywang.wxpay.bean.invoice.GeneralInvoiceRequest;
+import com.github.binarywang.wxpay.bean.invoice.PassengerTransportInvoiceRequest;
import com.github.binarywang.wxpay.bean.invoice.InvoiceResult;
import com.github.binarywang.wxpay.bean.invoice.InvoiceFileResult;
import com.github.binarywang.wxpay.bean.invoice.ReverseInvoiceRequest;
@@ -45,6 +46,7 @@ public class PartnerInvoiceServiceImpl implements PartnerInvoiceService {
private static final com.google.gson.Gson GSON = WxGsonBuilder.create();
private static final String INVITE_URL_PATH = "/v3/new-tax-control-fapiao/fapiaomerchant/getspinviteurl";
private static final String ISSUE_GENERAL_PATH = "/v3/new-tax-control-fapiao/fapiao-applications/issue-general";
+ private static final String ISSUE_PASSENGER_TRANSPORT_PATH = "/v3/new-tax-control-fapiao/fapiao-applications/issue-passenger-transport";
private static final String FAPIAO_APPLICATIONS_PATH = "/v3/new-tax-control-fapiao/fapiao-applications/";
private final WxPayService payService;
@@ -80,6 +82,12 @@ public void issueGeneralInvoice(GeneralInvoiceRequest request) throws WxPayExcep
this.payService.postV3(url, GSON.toJson(request));
}
+ @Override
+ public void issuePassengerTransportInvoice(PassengerTransportInvoiceRequest request) throws WxPayException {
+ String url = this.payService.getPayBaseUrl() + ISSUE_PASSENGER_TRANSPORT_PATH;
+ this.payService.postV3(url, GSON.toJson(request));
+ }
+
@Override
public InvoiceResult getInvoice(String fapiaoApplyId, String subMchId, String fapiaoId) throws WxPayException {
String url = this.payService.getPayBaseUrl() + FAPIAO_APPLICATIONS_PATH + encode(fapiaoApplyId) + "?sub_mchid=" + encode(subMchId);
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
index 12b85670f9..69a67ca0b4 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
@@ -128,6 +128,7 @@ public String postV3(String url, String requestStr) throws WxPayException {
}
private String requestV3(String url, String requestStr, HttpRequestBase httpRequestBase) throws WxPayException {
+ this.checkV3SandboxNotSupported();
CloseableHttpClient httpClient = this.createApiV3HttpClient();
try (CloseableHttpResponse response = httpClient.execute(httpRequestBase)) {
//v3已经改为通过状态码判断200 204 成功
@@ -158,11 +159,13 @@ private String requestV3(String url, String requestStr, HttpRequestBase httpRequ
public String patchV3(String url, String requestStr) throws WxPayException {
HttpPatch httpPatch = new HttpPatch(url);
httpPatch.setEntity(createEntry(requestStr));
+ this.configureRequest(httpPatch);
return this.requestV3(url, requestStr, httpPatch);
}
@Override
public String postV3WithWechatpaySerial(String url, String requestStr) throws WxPayException {
+ this.checkV3SandboxNotSupported();
HttpPost httpPost = this.createHttpPost(url, requestStr);
this.configureRequest(httpPost);
CloseableHttpClient httpClient = this.createApiV3HttpClient();
@@ -199,6 +202,7 @@ public String postV3(String url, HttpPost httpPost) throws WxPayException {
@Override
public String requestV3(String url, HttpRequestBase httpRequest) throws WxPayException {
+ this.checkV3SandboxNotSupported();
this.configureRequest(httpRequest);
CloseableHttpClient httpClient = this.createApiV3HttpClient();
try (CloseableHttpResponse response = httpClient.execute(httpRequest)) {
@@ -243,6 +247,7 @@ public String getV3WithWechatPaySerial(String url) throws WxPayException {
@Override
public InputStream downloadV3(String url) throws WxPayException {
+ this.checkV3SandboxNotSupported();
HttpGet httpGet = new WxPayV3DownloadHttpGet(url);
this.configureRequest(httpGet);
CloseableHttpClient httpClient = this.createApiV3HttpClient();
@@ -285,6 +290,7 @@ public String deleteV3(String url) throws WxPayException {
}
private void configureRequest(HttpRequestBase request) {
+ this.checkV3SandboxNotSupported();
String serialNumber = getWechatPaySerial(getConfig());
String method = request.getMethod();
request.addHeader(ACCEPT, APPLICATION_JSON);
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceHttpComponentsImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceHttpComponentsImpl.java
index cc5423302b..d28cbc890b 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceHttpComponentsImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceHttpComponentsImpl.java
@@ -125,6 +125,7 @@ public String postV3(String url, String requestStr) throws WxPayException {
}
private String requestV3(String url, String requestStr, HttpRequestBase httpRequestBase) throws WxPayException {
+ this.checkV3SandboxNotSupported();
CloseableHttpClient httpClient = this.createApiV3HttpClient();
try (CloseableHttpResponse response = httpClient.execute(httpRequestBase)) {
//v3已经改为通过状态码判断200 204 成功
@@ -155,11 +156,13 @@ private String requestV3(String url, String requestStr, HttpRequestBase httpRequ
public String patchV3(String url, String requestStr) throws WxPayException {
HttpPatch httpPatch = new HttpPatch(url);
httpPatch.setEntity(createEntry(requestStr));
+ this.configureRequest(httpPatch);
return this.requestV3(url, requestStr, httpPatch);
}
@Override
public String postV3WithWechatpaySerial(String url, String requestStr) throws WxPayException {
+ this.checkV3SandboxNotSupported();
HttpPost httpPost = this.createHttpPost(url, requestStr);
this.configureRequest(httpPost);
CloseableHttpClient httpClient = this.createApiV3HttpClient();
@@ -196,6 +199,7 @@ public String postV3(String url, HttpPost httpPost) throws WxPayException {
@Override
public String requestV3(String url, HttpRequestBase httpRequest) throws WxPayException {
+ this.checkV3SandboxNotSupported();
this.configureRequest(httpRequest);
CloseableHttpClient httpClient = this.createApiV3HttpClient();
try (CloseableHttpResponse response = httpClient.execute(httpRequest)) {
@@ -240,6 +244,7 @@ public String getV3WithWechatPaySerial(String url) throws WxPayException {
@Override
public InputStream downloadV3(String url) throws WxPayException {
+ this.checkV3SandboxNotSupported();
HttpGet httpGet = new WxPayV3DownloadHttpGet(url);
this.configureRequest(httpGet);
CloseableHttpClient httpClient = this.createApiV3HttpClient();
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/invoice/PassengerTransportInvoiceRequestTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/invoice/PassengerTransportInvoiceRequestTest.java
new file mode 100644
index 0000000000..e4b8fe0783
--- /dev/null
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/invoice/PassengerTransportInvoiceRequestTest.java
@@ -0,0 +1,93 @@
+package com.github.binarywang.wxpay.bean.invoice;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import org.testng.annotations.Test;
+
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * {@link PassengerTransportInvoiceRequest} 单元测试。
+ */
+public class PassengerTransportInvoiceRequestTest {
+
+ @Test
+ public void shouldSerializePassengerTransportInvoiceRequestUsingWechatPayFieldNames() {
+ PassengerTransportInvoiceRequest request = new PassengerTransportInvoiceRequest();
+ request.setSubMchid("1900000109");
+ request.setFapiaoApplyId("apply_20260827_001");
+
+ BuyerInformation buyer = new BuyerInformation();
+ buyer.setType("INDIVIDUAL");
+ buyer.setName("示例旅客");
+ buyer.setPhone("encrypted-phone");
+ buyer.setEmail("encrypted-email");
+ buyer.setAmount(1000);
+ request.setBuyerInformation(buyer);
+
+ PassengerTransportInvoiceRequest.PassengerInformation passenger =
+ new PassengerTransportInvoiceRequest.PassengerInformation();
+ passenger.setName("张**");
+ passenger.setCertificateType("IDENTITY_CARD");
+ passenger.setCertificateNumber("encrypted-certificate-number");
+ passenger.setDepartureDate("2026-08-27T10:00:00+08:00");
+ passenger.setDeparturePlace("重庆市渝北区示例出发地");
+ passenger.setDestination("重庆市两江新区示例目的地");
+ passenger.setTransportationType("SHIP");
+ passenger.setTransportationClasses("SHIP_FIRST_CLASS_CABIN");
+
+ PassengerTransportInvoiceRequest.InvoiceItem item = new PassengerTransportInvoiceRequest.InvoiceItem();
+ item.setTaxCode("3010101020100000000");
+ item.setGoodsName("旅客运输服务");
+ item.setQuantity(2200000000L);
+ item.setTotalAmount(1000L);
+ item.setTaxRate(300L);
+ item.setDiscount(false);
+ item.setPassengerInformation(passenger);
+
+ PassengerTransportInvoiceRequest.TransactionInformation transaction =
+ new PassengerTransportInvoiceRequest.TransactionInformation();
+ transaction.setPayChannel("WECHAT_PAY");
+ transaction.setOutTradeNo("order_20260827_001");
+ transaction.setAmount(1000L);
+
+ PassengerTransportInvoiceRequest.FapiaoInformation fapiao =
+ new PassengerTransportInvoiceRequest.FapiaoInformation();
+ fapiao.setFapiaoId("invoice_20260827_001");
+ fapiao.setTotalAmount(1000L);
+ fapiao.setItems(Collections.singletonList(item));
+ fapiao.setBillingPersonId("billing_person_001");
+ fapiao.setFapiaoBillType("COMM_FAPIAO");
+ fapiao.setTransactionInformation(Collections.singletonList(transaction));
+ request.setFapiaoInformation(fapiao);
+
+ JsonObject json = new Gson().toJsonTree(request).getAsJsonObject();
+ JsonObject passengerJson = json.getAsJsonObject("fapiao_information")
+ .getAsJsonArray("items").get(0).getAsJsonObject()
+ .getAsJsonObject("passenger_information");
+
+ assertThat(json.get("sub_mchid").getAsString()).isEqualTo("1900000109");
+ assertThat(json.get("fapiao_apply_id").getAsString()).isEqualTo("apply_20260827_001");
+ assertThat(json.getAsJsonObject("buyer_information").get("phone").getAsString())
+ .isEqualTo("encrypted-phone");
+ assertThat(json.getAsJsonObject("fapiao_information").getAsJsonArray("items").get(0)
+ .getAsJsonObject().get("quantity").getAsLong()).isEqualTo(2200000000L);
+ assertThat(passengerJson.get("name").getAsString()).isEqualTo("张**");
+ assertThat(passengerJson.get("certificate_type").getAsString()).isEqualTo("IDENTITY_CARD");
+ assertThat(passengerJson.get("certificate_number").getAsString())
+ .isEqualTo("encrypted-certificate-number");
+ assertThat(passengerJson.get("departure_date").getAsString())
+ .isEqualTo("2026-08-27T10:00:00+08:00");
+ assertThat(passengerJson.get("departure_place").getAsString())
+ .isEqualTo("重庆市渝北区示例出发地");
+ assertThat(passengerJson.get("destination").getAsString())
+ .isEqualTo("重庆市两江新区示例目的地");
+ assertThat(passengerJson.get("transportation_type").getAsString()).isEqualTo("SHIP");
+ assertThat(passengerJson.get("transportation_classes").getAsString())
+ .isEqualTo("SHIP_FIRST_CLASS_CABIN");
+ assertThat(json.getAsJsonObject("fapiao_information").getAsJsonArray("transaction_information").get(0)
+ .getAsJsonObject().get("out_trade_no").getAsString()).isEqualTo("order_20260827_001");
+ }
+}
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/LegacyEcommerceApiCompatibilityTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/LegacyEcommerceApiCompatibilityTest.java
new file mode 100644
index 0000000000..f0b5783415
--- /dev/null
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/LegacyEcommerceApiCompatibilityTest.java
@@ -0,0 +1,106 @@
+package com.github.binarywang.wxpay.service;
+
+import com.github.binarywang.wxpay.bean.ecommerce.PartnerTransactionsCloseRequest;
+import com.github.binarywang.wxpay.bean.ecommerce.TransactionsResult;
+import com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum;
+import com.github.binarywang.wxpay.bean.request.WxPayPartnerOrderCloseV3Request;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ObjectInputStream;
+import java.util.Base64;
+
+/**
+ * Compatibility checks for the pre-#4014 e-commerce API.
+ */
+public class LegacyEcommerceApiCompatibilityTest {
+
+ @Test
+ public void shouldKeepLegacyTransactionResultAndTradeTypeAvailable() {
+ TransactionsResult result = new TransactionsResult();
+
+ Assert.assertNotNull(result);
+ Assert.assertEquals(TradeTypeEnum.JSAPI.name(), "JSAPI");
+ }
+
+ @Test
+ public void shouldKeepLegacyRefundAndWithdrawNotificationSignatures() throws Exception {
+ Class legacyHeader = com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader.class;
+
+ Assert.assertNotNull(EcommerceService.class.getMethod("parseRefundNotifyResult", String.class, legacyHeader));
+ Assert.assertNotNull(EcommerceService.class.getMethod("parseWithdrawNotifyResult", String.class, legacyHeader));
+ }
+
+ @Test
+ public void shouldKeepLegacySignatureHeaderConstructorAndBuilderAbi() throws Exception {
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader legacyHeader =
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader.builder()
+ .timeStamp("timestamp")
+ .nonce("nonce")
+ .signed("signed")
+ .serialNo("serial-no")
+ .build();
+
+ Assert.assertNotNull(com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader.class.getConstructor(
+ String.class, String.class, String.class, String.class));
+ Assert.assertEquals(com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader.SignatureHeaderBuilder.class,
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader.SignatureHeaderBuilder.class
+ .getMethod("timeStamp", String.class).getReturnType());
+ Assert.assertEquals(com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader.SignatureHeaderBuilder.class,
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader.SignatureHeaderBuilder.class
+ .getMethod("nonce", String.class).getReturnType());
+ Assert.assertTrue(com.github.binarywang.wxpay.bean.notify.SignatureHeader.class
+ .isAssignableFrom(legacyHeader.getClass()));
+ com.github.binarywang.wxpay.bean.notify.SignatureHeader unifiedHeader =
+ EcommerceService.toUnifiedSignatureHeader(legacyHeader);
+ Assert.assertEquals(unifiedHeader.getTimeStamp(), "timestamp");
+ Assert.assertEquals(unifiedHeader.getNonce(), "nonce");
+ Assert.assertEquals(unifiedHeader.getSignature(), "signed");
+ Assert.assertEquals(unifiedHeader.getSerial(), "serial-no");
+ }
+
+ @Test
+ public void shouldIncludeTimestampAndNonceInLegacyHeaderEquality() {
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader first =
+ new com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader("timestamp-1", "nonce", "signed", "serial-no");
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader second =
+ new com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader("timestamp-2", "nonce", "signed", "serial-no");
+
+ Assert.assertNotEquals(first, second);
+ }
+
+ @Test
+ public void shouldPreserveOutTradeNoWhenMappingLegacyCloseRequest() {
+ PartnerTransactionsCloseRequest legacyRequest = new PartnerTransactionsCloseRequest();
+ legacyRequest.setSpMchid("1230000109");
+ legacyRequest.setSubMchid("1900000109");
+ legacyRequest.setOutTradeNo("1217752501201407033233368018");
+
+ WxPayPartnerOrderCloseV3Request unifiedRequest =
+ EcommerceService.toUnifiedPartnerOrderCloseRequest(legacyRequest);
+
+ Assert.assertEquals(unifiedRequest.getSpMchId(), "1230000109");
+ Assert.assertEquals(unifiedRequest.getSubMchId(), "1900000109");
+ Assert.assertEquals(unifiedRequest.getOutTradeNo(), "1217752501201407033233368018");
+ }
+
+ @Test
+ public void shouldReadLegacySerializedHeaderFields() throws Exception {
+ String legacySerializedHeader = "rO0ABXNyADpjb20uZ2l0aHViLmJpbmFyeXdhbmcud3hwYXkuYmVhbi5lY29tbWVyY2UuU2lnbmF0dXJlSGVhZGVyn3ApxLekv9MCAARMAAVub25jZXQAEkxqYXZhL2xhbmcvU3RyaW5nO0wACHNlcmlhbE5vcQB+AAFMAAZzaWduZWRxAH4AAUwACXRpbWVTdGFtcHEAfgABeHB0AAVub25jZXQACXNlcmlhbC1ub3QABnNpZ25lZHQACXRpbWVzdGFtcA==";
+ ObjectInputStream input = new ObjectInputStream(new ByteArrayInputStream(
+ Base64.getDecoder().decode(legacySerializedHeader)));
+ com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader header =
+ (com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader) input.readObject();
+
+ Assert.assertEquals(header.getTimeStamp(), "timestamp");
+ Assert.assertEquals(header.getNonce(), "nonce");
+ Assert.assertEquals(header.getSigned(), "signed");
+ Assert.assertEquals(header.getSerialNo(), "serial-no");
+ }
+
+ private void shouldCompileNullNotificationHeaderCalls(EcommerceService ecommerceService) throws Exception {
+ ecommerceService.parseRefundNotifyResult("notify-data", null);
+ ecommerceService.parseWithdrawNotifyResult("notify-data", null);
+ }
+}
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PartnerInvoiceServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PartnerInvoiceServiceImplTest.java
index f0aa2d16a5..51bff93bb6 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PartnerInvoiceServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PartnerInvoiceServiceImplTest.java
@@ -1,7 +1,9 @@
package com.github.binarywang.wxpay.service.impl;
+import com.github.binarywang.wxpay.service.PartnerInvoiceService;
import com.github.binarywang.wxpay.service.WxPayService;
import com.github.binarywang.wxpay.bean.invoice.GeneralInvoiceRequest;
+import com.github.binarywang.wxpay.bean.invoice.PassengerTransportInvoiceRequest;
import com.github.binarywang.wxpay.bean.invoice.InvoiceResult;
import com.github.binarywang.wxpay.bean.invoice.ReverseInvoiceRequest;
import com.github.binarywang.wxpay.bean.invoice.InvoiceFileResult;
@@ -18,6 +20,12 @@
*/
public class PartnerInvoiceServiceImplTest {
+ @Test
+ public void shouldKeepPassengerTransportInvoiceMethodSourceCompatible() throws Exception {
+ Assert.assertTrue(PartnerInvoiceService.class
+ .getMethod("issuePassengerTransportInvoice", PassengerTransportInvoiceRequest.class).isDefault());
+ }
+
@Test
public void shouldRequestInviteUrlWithOptionalSubMchId() throws Exception {
AtomicReference requestedUrl = new AtomicReference<>();
@@ -67,6 +75,44 @@ public void shouldPostGeneralInvoiceToV3Endpoint() throws Exception {
Assert.assertTrue(requestedBody.get().contains("\"fapiao_apply_id\":\"invoice-001\""));
}
+ @Test
+ public void shouldPostPassengerTransportInvoiceToV3Endpoint() throws Exception {
+ AtomicReference requestedUrl = new AtomicReference<>();
+ AtomicReference requestedBody = new AtomicReference<>();
+ WxPayService payService = (WxPayService) Proxy.newProxyInstance(
+ getClass().getClassLoader(), new Class[]{WxPayService.class}, (proxy, method, args) -> {
+ if ("getPayBaseUrl".equals(method.getName())) {
+ return "https://api.mch.weixin.qq.com";
+ }
+ if ("postV3".equals(method.getName())) {
+ requestedUrl.set((String) args[0]);
+ requestedBody.set((String) args[1]);
+ return null;
+ }
+ throw new UnsupportedOperationException(method.getName());
+ });
+ PassengerTransportInvoiceRequest request = new PassengerTransportInvoiceRequest();
+ request.setSubMchid("1900000109");
+ request.setFapiaoApplyId("invoice-002");
+ PassengerTransportInvoiceRequest.PassengerInformation passenger =
+ new PassengerTransportInvoiceRequest.PassengerInformation();
+ passenger.setCertificateNumber("encrypted-certificate-number");
+ PassengerTransportInvoiceRequest.InvoiceItem item = new PassengerTransportInvoiceRequest.InvoiceItem();
+ item.setPassengerInformation(passenger);
+ PassengerTransportInvoiceRequest.FapiaoInformation fapiao =
+ new PassengerTransportInvoiceRequest.FapiaoInformation();
+ fapiao.setItems(java.util.Collections.singletonList(item));
+ request.setFapiaoInformation(fapiao);
+
+ new PartnerInvoiceServiceImpl(payService).issuePassengerTransportInvoice(request);
+
+ Assert.assertEquals(requestedUrl.get(),
+ "https://api.mch.weixin.qq.com/v3/new-tax-control-fapiao/fapiao-applications/issue-passenger-transport");
+ Assert.assertTrue(requestedBody.get().contains("\"fapiao_apply_id\":\"invoice-002\""));
+ Assert.assertTrue(requestedBody.get().contains("\"passenger_information\""));
+ Assert.assertTrue(requestedBody.get().contains("\"certificate_number\":\"encrypted-certificate-number\""));
+ }
+
@Test
public void shouldQueryInvoiceWithRequiredSubMchId() throws Exception {
AtomicReference requestedUrl = new AtomicReference<>();
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceSandboxTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceSandboxTest.java
new file mode 100644
index 0000000000..2daa9845a7
--- /dev/null
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceSandboxTest.java
@@ -0,0 +1,53 @@
+package com.github.binarywang.wxpay.service.impl;
+
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import me.chanjar.weixin.common.error.WxRuntimeException;
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.expectThrows;
+
+public class WxPayServiceSandboxTest {
+
+ @Test
+ public void shouldUseV2SandboxUrlWhenV3KeyIsConfigured() {
+ WxPayConfig config = new WxPayConfig();
+ config.setApiHostUrl("https://api.mch.weixin.qq.com");
+ config.setApiHostUrlPath("/payment-proxy");
+ config.setApiV3Key("v3-key");
+ config.setUseSandboxEnv(true);
+
+ WxPayServiceImpl service = new WxPayServiceImpl();
+ service.setConfig(config);
+
+ assertEquals(service.getPayBaseUrl(), "https://api.mch.weixin.qq.com/payment-proxy/xdc/apiv2sandbox");
+ }
+
+ @Test
+ public void shouldRejectV3RequestWhenSandboxIsEnabled() {
+ WxPayConfig config = new WxPayConfig();
+ config.setUseSandboxEnv(true);
+
+ WxPayServiceImpl service = new WxPayServiceImpl();
+ service.setConfig(config);
+
+ WxRuntimeException exception = expectThrows(WxRuntimeException.class,
+ () -> service.postV3("https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi", "{}"));
+
+ assertEquals(exception.getMessage(), "微信支付V3 目前不支持沙箱模式！");
+ }
+
+ @Test
+ public void shouldRejectHttpComponentsV3RequestWhenSandboxIsEnabled() {
+ WxPayConfig config = new WxPayConfig();
+ config.setUseSandboxEnv(true);
+
+ WxPayServiceHttpComponentsImpl service = new WxPayServiceHttpComponentsImpl();
+ service.setConfig(config);
+
+ WxRuntimeException exception = expectThrows(WxRuntimeException.class,
+ () -> service.postV3("https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi", "{}"));
+
+ assertEquals(exception.getMessage(), "微信支付V3 目前不支持沙箱模式！");
+ }
+}
diff --git a/weixin-java-qidian/pom.xml b/weixin-java-qidian/pom.xml
index c1a8802260..48f3cfd155 100644
--- a/weixin-java-qidian/pom.xml
+++ b/weixin-java-qidian/pom.xml
@@ -7,7 +7,7 @@
com.github.binarywang
wx-java
- 4.8.5.B
+ 4.8.6.B
weixin-java-qidian
diff --git a/weixin-java-store/pom.xml b/weixin-java-store/pom.xml
new file mode 100644
index 0000000000..76df7eb5b8
--- /dev/null
+++ b/weixin-java-store/pom.xml
@@ -0,0 +1,130 @@
+
+
+ 4.0.0
+
+ com.github.binarywang
+ wx-java
+ 4.8.6.B
+
+
+ weixin-java-store
+ WxJava - Weixin Store Java SDK
+ 微信小店 Java SDK
+
+
+
+ com.github.binarywang
+ weixin-java-common
+ ${project.version}
+
+
+ org.jodd
+ jodd-http
+ provided
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ org.apache.httpcomponents
+ httpmime
+
+
+ org.apache.httpcomponents.client5
+ httpclient5
+ provided
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+ 2.18.8
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ 2.18.8
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-xml
+ 2.18.8
+ true
+
+
+ org.bouncycastle
+ bcpkix-jdk18on
+
+
+ org.projectlombok
+ lombok
+
+
+ org.redisson
+ redisson
+
+
+ com.squareup.okhttp3
+ okhttp
+ provided
+
+
+ org.testng
+ testng
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ ch.qos.logback
+ logback-classic
+ test
+
+
+ com.google.inject
+ guice
+ test
+
+
+ org.eclipse.jetty
+ jetty-server
+ test
+
+
+ org.eclipse.jetty
+ jetty-servlet
+ test
+
+
+ org.assertj
+ assertj-guava
+ test
+
+
+ redis.clients
+ jedis
+
+
+ com.github.jedis-lock
+ jedis-lock
+ true
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ ${maven.test.skip}
+
+
+
+
+
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/BaseWxStoreMessageService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/BaseWxStoreMessageService.java
new file mode 100644
index 0000000000..65d2887015
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/BaseWxStoreMessageService.java
@@ -0,0 +1,540 @@
+package com.binarywang.wxjava.store.api;
+
+import java.util.Map;
+import com.binarywang.wxjava.store.bean.message.after.AfterSaleMessage;
+import com.binarywang.wxjava.store.bean.message.after.ComplaintMessage;
+import com.binarywang.wxjava.store.bean.message.coupon.CouponActionMessage;
+import com.binarywang.wxjava.store.bean.message.coupon.CouponReceiveMessage;
+import com.binarywang.wxjava.store.bean.message.coupon.UserCouponExpireMessage;
+import com.binarywang.wxjava.store.bean.message.fund.AccountNotifyMessage;
+import com.binarywang.wxjava.store.bean.message.fund.QrNotifyMessage;
+import com.binarywang.wxjava.store.bean.message.fund.WithdrawNotifyMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderCancelMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderConfirmMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderDeliveryMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderExtMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderIdMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderPayMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderSettleMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderStatusMessage;
+import com.binarywang.wxjava.store.bean.message.product.BrandMessage;
+import com.binarywang.wxjava.store.bean.message.product.CategoryAuditMessage;
+import com.binarywang.wxjava.store.bean.message.product.SpuAuditMessage;
+import com.binarywang.wxjava.store.bean.message.product.SpuStockMessage;
+import com.binarywang.wxjava.store.bean.message.store.CloseStoreMessage;
+import com.binarywang.wxjava.store.bean.message.store.NicknameUpdateMessage;
+import com.binarywang.wxjava.store.bean.message.supplier.SupplierItemMessage;
+import com.binarywang.wxjava.store.bean.message.vip.ExchangeInfoMessage;
+import com.binarywang.wxjava.store.bean.message.vip.UserInfoMessage;
+import com.binarywang.wxjava.store.bean.message.voucher.VoucherMessage;
+import com.binarywang.wxjava.store.message.WxStoreMessage;
+import com.binarywang.wxjava.store.message.WxStoreMessageRouterRule;
+import me.chanjar.weixin.common.session.WxSessionManager;
+
+/**
+ * @author Zeyes
+ */
+public interface BaseWxStoreMessageService {
+
+ /**
+ * 路由微信消息
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param service 服务实例
+ * @return Object
+ */
+ Object route(final WxStoreMessage message, final String content, final String appId,
+ final WxStoreService service);
+
+ /**
+ * 添加一条规则进入路由器
+ *
+ * @param rule 规则
+ */
+ void addRule(WxStoreMessageRouterRule rule);
+
+ /**
+ * 订单下单
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void orderNew(final OrderIdMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 订单取消
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void orderCancel(OrderCancelMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 订单支付成功
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void orderPay(OrderPayMessage message, final String content, final String appId, final Map context,
+ final WxSessionManager sessionManager);
+
+ /**
+ * 订单待发货
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void orderWaitShipping(OrderIdMessage message, final String content, final String appId, final Map context,
+ final WxSessionManager sessionManager);
+
+ /**
+ * 订单发货
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void orderDelivery(OrderDeliveryMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 订单确认收货
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void orderConfirm(OrderConfirmMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 订单结算成功
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void orderSettle(OrderSettleMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 订单其他信息更新
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void orderExtInfoUpdate(OrderExtMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 订单状态更新
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void orderStatusUpdate(OrderStatusMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 商品审核结果
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void spuAudit(SpuAuditMessage message, final String content, final String appId, final Map context,
+ final WxSessionManager sessionManager);
+
+ /**
+ * 商品系统下架通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void spuStatusUpdate(SpuAuditMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 商品更新通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void spuUpdate(SpuAuditMessage message, final String content, final String appId, final Map context,
+ final WxSessionManager sessionManager);
+
+ /**
+ * 商品库存不足通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void stockNoEnough(SpuStockMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 类目审核结果
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void categoryAudit(CategoryAuditMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 品牌更新
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void brandUpdate(BrandMessage message, final String content, final String appId, final Map context,
+ final WxSessionManager sessionManager);
+
+ /**
+ * 售后单状态更新
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void afterSaleStatusUpdate(AfterSaleMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 纠纷回调
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void complaintNotify(ComplaintMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 用户领券通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void couponReceive(CouponReceiveMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 创建优惠券通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void couponCreate(CouponActionMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 优惠券删除通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void couponDelete(CouponActionMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 优惠券过期通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void couponExpire(CouponActionMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 更新优惠券信息通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void couponUpdate(CouponActionMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 优惠券作废通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void couponInvalid(CouponActionMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 用户优惠券过期通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void userCouponExpire(UserCouponExpireMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 用户优惠券使用通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void userCouponUse(UserCouponExpireMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 用户优惠券返还通知
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void userCouponUnuse(UserCouponExpireMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 发放团购优惠成功回调
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void voucherSendSucc(VoucherMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+ /**
+ * 结算账户变更回调
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void accountNotify(AccountNotifyMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 提现回调
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void withdrawNotify(WithdrawNotifyMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 提现二维码回调
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void qrNotify(QrNotifyMessage message, final String content, final String appId, final Map context,
+ final WxSessionManager sessionManager);
+
+ /**
+ * 团长商品变更
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void supplierItemUpdate(SupplierItemMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+
+ /**
+ * 用户加入会员.
+ *
+ * @param message the message
+ * @param content the content
+ * @param appId the app id
+ * @param context the context
+ * @param sessionManager the session manager
+ */
+ public void vipJoin(UserInfoMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 用户注销会员.
+ *
+ * @param message the message
+ * @param content the content
+ * @param appId the app id
+ * @param context the context
+ * @param sessionManager the session manager
+ */
+ void vipClose(UserInfoMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 用户等级更新.
+ *
+ * @param message the message
+ * @param content the content
+ * @param appId the app id
+ * @param context the context
+ * @param sessionManager the session manager
+ */
+ void vipGradeUpdate(UserInfoMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 用户积分更新.
+ *
+ * @param message the message
+ * @param content the content
+ * @param appId the app id
+ * @param context the context
+ * @param sessionManager the session manager
+ */
+ void vipScoreUpdate(UserInfoMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 用户积分兑换
+ *
+ * @param message the message
+ * @param content the content
+ * @param appId the app id
+ * @param context the context
+ * @param sessionManager the session manager
+ */
+ void vipScoreExchange(ExchangeInfoMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 小店注销
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void closeStore(CloseStoreMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+
+ /**
+ * 小店修改名称
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ */
+ void updateNickname(NicknameUpdateMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+ /**
+ * 默认消息处理
+ *
+ * @param message 消息
+ * @param content 消息原始内容
+ * @param appId appId
+ * @param context 上下文
+ * @param sessionManager session管理器
+ * @return Object
+ */
+ Object defaultMessageHandler(WxStoreMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+
+
+ /**
+ * 分享员变更
+ *
+ * @param message the message
+ * @param content the content
+ * @param appId the app id
+ * @param context the context
+ * @param sessionManager the session manager
+ */
+ void sharerChange(WxStoreMessage message, final String content, final String appId,
+ final Map context, final WxSessionManager sessionManager);
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/BaseWxStoreService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/BaseWxStoreService.java
new file mode 100644
index 0000000000..4574e4cf57
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/BaseWxStoreService.java
@@ -0,0 +1,135 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.config.WxStoreConfig;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.service.WxService;
+import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
+import me.chanjar.weixin.common.util.http.RequestExecutor;
+import me.chanjar.weixin.common.util.http.RequestHttp;
+
+/**
+ * The interface Wx Store service
+ *
+ * @author Zeyes
+ */
+public interface BaseWxStoreService extends WxService {
+
+ /**
+ *
+ * 验证消息的确来自微信服务器.
+ * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421135319&token=&lang=zh_CN
+ *
+ *
+ * @param timestamp the timestamp
+ * @param nonce the nonce
+ * @param signature the signature
+ * @return the boolean
+ */
+ boolean checkSignature(String timestamp, String nonce, String signature);
+
+ /**
+ * 获取access_token, 不强制刷新access_token.
+ *
+ * @return the access token
+ *
+ * @throws WxErrorException the wx error exception
+ * @see #getAccessToken(boolean) #getAccessToken(boolean)
+ */
+ String getAccessToken() throws WxErrorException;
+
+ /**
+ *
+ * 获取access_token，本方法线程安全.
+ * 且在多线程同时刷新时只刷新一次，避免超出2000次/日的调用次数上限
+ * 使用【稳定版接口】获取access_token时，限制【20次/日】，连续使用该模式时，请保证调用时间隔至少为30s，否则不会刷新
+ *
+ * 程序员在非必要情况下尽量不要主动调用此方法
+ *
+ * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140183&token=&lang=zh_CN
+ *
+ *
+ * @param forceRefresh 强制刷新
+ * @return the access token
+ *
+ * @throws WxErrorException the wx error exception
+ */
+ String getAccessToken(boolean forceRefresh) throws WxErrorException;
+
+ /**
+ *
+ * Service没有实现某个API的时候，可以用这个，
+ * 比{@link #get}和{@link #post}方法更灵活，可以自己构造RequestExecutor用来处理不同的参数和不同的返回类型。
+ * 可以参考，{@link MediaUploadRequestExecutor}的实现方法
+ *
+ *
+ * @param .
+ * @param .
+ * @param executor 执行器
+ * @param uri 接口请求地址
+ * @param data 参数或请求数据
+ * @return . t
+ *
+ * @throws WxErrorException the wx error exception
+ */
+ T execute(RequestExecutor executor, String uri, E data) throws WxErrorException;
+
+ /**
+ * 执行器
+ *
+ * @param .
+ * @param .
+ * @param executor 执行器
+ * @param uri 接口请求地址
+ * @param data 参数或请求数据
+ * @return T
+ *
+ * @throws WxErrorException the wx error exception
+ */
+ T executeWithoutLog(RequestExecutor executor, String uri, E data) throws WxErrorException;
+
+ /**
+ *
+ * 设置当微信系统响应系统繁忙时，要等待多少 retrySleepMillis(ms) * 2^(重试次数 - 1) 再发起重试.
+ * 默认：1000ms
+ *
+ *
+ * @param retrySleepMillis 重试等待毫秒数
+ */
+ void setRetrySleepMillis(int retrySleepMillis);
+
+ /**
+ *
+ * 设置当微信系统响应系统繁忙时，最大重试次数.
+ * 默认：5次
+ *
+ *
+ * @param maxRetryTimes 最大重试次数
+ */
+ void setMaxRetryTimes(int maxRetryTimes);
+
+ /**
+ * WxStoreConfig对象
+ *
+ * @return WxMaConfig WxStoreConfig
+ */
+ WxStoreConfig getConfig();
+
+ /**
+ * 注入 {@link WxStoreConfig} 的实现.
+ *
+ * @param config config
+ */
+ void setConfig(WxStoreConfig config);
+
+ /**
+ * 初始化http请求对象.
+ */
+ void initHttp();
+
+ /**
+ * 请求http请求相关信息.
+ *
+ * @return . request http
+ */
+ RequestHttp getRequestHttp();
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreAddressService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreAddressService.java
new file mode 100644
index 0000000000..10968c73b5
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreAddressService.java
@@ -0,0 +1,68 @@
+package com.binarywang.wxjava.store.api;
+
+
+import com.binarywang.wxjava.store.bean.address.AddressDetail;
+import com.binarywang.wxjava.store.bean.address.AddressIdResponse;
+import com.binarywang.wxjava.store.bean.address.AddressInfoResponse;
+import com.binarywang.wxjava.store.bean.address.AddressListResponse;
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 地址管理服务
+ *
+ * @author Zeyes
+ */
+public interface WxStoreAddressService {
+
+ /**
+ * 获取地址列表
+ *
+ * @param offset 起始位置
+ * @param limit 拉取个数
+ * @return 列表
+ *
+ * @throws WxErrorException 异常
+ */
+ AddressListResponse listAddress(Integer offset, Integer limit) throws WxErrorException;
+
+ /**
+ * 获取地址详情
+ *
+ * @param addressId 地址id
+ * @return 地址详情
+ *
+ * @throws WxErrorException 异常
+ */
+ AddressInfoResponse getAddress(String addressId) throws WxErrorException;
+
+ /**
+ * 添加地址
+ *
+ * @param addressDetail 地址
+ * @return AddressIdResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ AddressIdResponse addAddress(AddressDetail addressDetail) throws WxErrorException;
+
+ /**
+ * 更新地址
+ *
+ * @param addressDetail 地址
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateAddress(AddressDetail addressDetail) throws WxErrorException;
+
+ /**
+ * 删除地址
+ *
+ * @param addressId 地址id
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse deleteAddress(String addressId) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreAfterSaleService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreAfterSaleService.java
new file mode 100644
index 0000000000..e6a6b4969f
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreAfterSaleService.java
@@ -0,0 +1,274 @@
+package com.binarywang.wxjava.store.api;
+
+
+import java.util.List;
+
+import com.binarywang.wxjava.store.bean.after.*;
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.complaint.ComplaintOrderResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 售后服务接口
+ *
+ * @author Zeyes
+ */
+public interface WxStoreAfterSaleService {
+
+ /**
+ * 获取售后单列表
+ *
+ * @param beginCreateTime 订单创建启始时间 unix时间戳
+ * @param endCreateTime 订单创建结束时间，end_create_time减去begin_create_time不得大于24小时
+ * @param nextKey 翻页参数，从第二页开始传，来源于上一页的返回值
+ * @return 售后单列表
+ *
+ * @throws WxErrorException 异常
+ * @deprecated 使用 {@link WxStoreAfterSaleService#listIds(AfterSaleListParam)}
+ */
+ @Deprecated
+ AfterSaleListResponse listIds(Long beginCreateTime, Long endCreateTime, String nextKey)
+ throws WxErrorException;
+
+ /**
+ * 获取售后单列表
+ *
+ * @param param 参数
+ * @return 售后单列表
+ *
+ * @throws WxErrorException 异常
+ */
+ AfterSaleListResponse listIds(AfterSaleListParam param) throws WxErrorException;
+
+ /**
+ * 获取售后单详情
+ *
+ * @param afterSaleOrderId 售后单号
+ * @return 售后单信息
+ *
+ * @throws WxErrorException 异常
+ */
+ AfterSaleInfoResponse get(String afterSaleOrderId) throws WxErrorException;
+
+ /**
+ * 同意售后
+ * 文档地址 https://developers.weixin.qq.com/doc/channels/API/aftersale/acceptapply.html
+ *
+ * @param afterSaleOrderId 售后单号
+ * @param addressId 同意退货时传入地址id
+ * @param acceptType 1. 同意退货退款，并通知用户退货; 2. 确认收到货并退款给用户。 如果不填则将根据当前的售后单状态自动选择相应操作。对于仅退款的情况，由于只存在一种同意的场景，无需填写此字段。
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse accept(String afterSaleOrderId, String addressId, Integer acceptType) throws WxErrorException;
+
+ /**
+ * 拒绝售后
+ * 文档地址 https://developers.weixin.qq.com/doc/channels/API/aftersale/rejectapply.html
+ *
+ * @param afterSaleOrderId 售后单号
+ * @param rejectReason 拒绝原因
+ * @param rejectReasonType 拒绝原因枚举值
+ * @see #getRejectReason()
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse reject(String afterSaleOrderId, String rejectReason, Integer rejectReasonType) throws WxErrorException;
+
+ /**
+ * 拒绝售后（支持拒绝凭证）
+ * 文档地址 https://developers.weixin.qq.com/doc/channels/API/aftersale/rejectapply.html
+ *
+ * @param afterSaleOrderId 售后单号
+ * @param rejectReason 拒绝原因
+ * @param rejectReasonType 拒绝原因枚举值
+ * @param rejectCertificates 拒绝凭证图片列表，可使用图片上传接口获取media_id
+ * @see #getRejectReason()
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse reject(String afterSaleOrderId, String rejectReason, Integer rejectReasonType,
+ List rejectCertificates) throws WxErrorException;
+
+ /**
+ * 上传退款凭证
+ *
+ * @param afterSaleOrderId 售后单号
+ * @param desc 退款凭证描述
+ * @param certificates 退款凭证图片列表
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse uploadRefundEvidence(String afterSaleOrderId, String desc, List certificates)
+ throws WxErrorException;
+
+ /**
+ * 商家补充纠纷单留言
+ *
+ * @param complaintId 纠纷单号
+ * @param content 留言内容，最多500字
+ * @param mediaIds 图片media_id列表，所有留言总图片数量最多20张
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse addComplaintMaterial(String complaintId, String content, List mediaIds)
+ throws WxErrorException;
+
+ /**
+ * 商家举证
+ *
+ * @param complaintId 纠纷单号
+ * @param content 举证内容，最多500字
+ * @param mediaIds 图片media_id列表，所有留言总图片数量最多20张
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse addComplaintEvidence(String complaintId, String content, List mediaIds)
+ throws WxErrorException;
+
+ /**
+ * 获取纠纷单
+ *
+ * @param complaintId 纠纷单号
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ ComplaintOrderResponse getComplaint(String complaintId) throws WxErrorException;
+
+
+ /**
+ * 获取全量售后原因
+ * 文档地址：https://developers.weixin.qq.com/doc/channels/API/aftersale/getaftersalereason.html
+ *
+ * @return 售后原因
+ *
+ * @throws WxErrorException 异常
+ */
+ AfterSaleReasonResponse getAllReason() throws WxErrorException;
+
+ /**
+ * 获取拒绝售后原因
+ * 文档地址：https://developers.weixin.qq.com/doc/channels/API/aftersale/getrejectreason.html
+ *
+ * @return 拒绝售后原因
+ *
+ * @throws WxErrorException 异常
+ */
+ AfterSaleRejectReasonResponse getRejectReason() throws WxErrorException;
+
+ /**
+ * 换货发货
+ * 文档地址：https://developers.weixin.qq.com/doc/store/shop/API/channels-shop-aftersale/api_acceptexchangereship.html
+ *
+ * @param afterSaleOrderId 售后单号
+ * @param waybillId 快递单号
+ * @param deliveryId 快递公司id
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse acceptExchangeReship(String afterSaleOrderId, String waybillId, String deliveryId) throws WxErrorException;
+
+ /**
+ * 换货拒绝发货
+ * 文档地址：https://developers.weixin.qq.com/doc/store/shop/API/channels-shop-aftersale/api_rejectexchangereship.html
+ *
+ * @param afterSaleOrderId 售后单号
+ * @param rejectReason 拒绝原因具体描述 ,可使用默认描述，也可以自定义描述
+ * @param rejectReasonType 拒绝原因枚举值
+ * @param rejectCertificates 退款凭证，可使用图片上传接口获取media_id（数据类型填0）
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse rejectExchangeReship(String afterSaleOrderId, String rejectReason, Integer rejectReasonType, List rejectCertificates) throws WxErrorException;
+
+ /**
+ * 商家协商
+ * 文档地址：https://developers.weixin.qq.com/doc/store/shop/API/channels-shop-aftersale/api_merchantupdateaftersale.html
+ * @param param 参数
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse merchantUpdateAfterSale(AfterSaleMerchantUpdateParam param) throws WxErrorException;
+
+ /**
+ * 获取保障单列表。
+ * 文档地址：https://developers.weixin.qq.com/doc/channels/API/channels-shop-aftersale/guarantee/api_searchguaranteeorder
+ *
+ * @param param 查询参数
+ * @return 保障单列表
+ * @throws WxErrorException 异常
+ */
+ default GuaranteeOrderListResponse listGuaranteeOrder(GuaranteeOrderListParam param) throws WxErrorException {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * 获取保障单详情。
+ * 文档地址：https://developers.weixin.qq.com/doc/channels/API/channels-shop-aftersale/guarantee/api_getguaranteeorder
+ *
+ * @param guaranteeOrderId 保障单号
+ * @return 保障单详情
+ * @throws WxErrorException 异常
+ */
+ default GuaranteeOrderInfoResponse getGuaranteeOrder(String guaranteeOrderId) throws WxErrorException {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * 同意保障单申请。
+ * 文档地址：https://developers.weixin.qq.com/doc/channels/API/channels-shop-aftersale/guarantee/api_merchantacceptguarantee
+ *
+ * @param guaranteeOrderId 保障单号
+ * @return 响应结果
+ * @throws WxErrorException 异常
+ */
+ default WxStoreBaseResponse acceptGuarantee(String guaranteeOrderId) throws WxErrorException {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * 商家协商保障单。
+ * 文档地址：https://developers.weixin.qq.com/doc/channels/API/channels-shop-aftersale/guarantee/api_merchantmodifyguarantee
+ *
+ * @param request 协商参数
+ * @return 响应结果
+ * @throws WxErrorException 异常
+ */
+ default WxStoreBaseResponse modifyGuarantee(GuaranteeModifyRequest request) throws WxErrorException {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * 商家举证保障单。
+ * 文档地址：https://developers.weixin.qq.com/doc/channels/API/channels-shop-aftersale/guarantee/api_merchantproofguarantee
+ *
+ * @param request 举证参数
+ * @return 响应结果
+ * @throws WxErrorException 异常
+ */
+ default WxStoreBaseResponse proofGuarantee(GuaranteeProofRequest request) throws WxErrorException {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * 拒绝保障单申请。
+ * 文档地址：https://developers.weixin.qq.com/doc/channels/API/channels-shop-aftersale/guarantee/api_merchantrefuseguarantee
+ *
+ * @param request 拒绝参数
+ * @return 响应结果
+ * @throws WxErrorException 异常
+ */
+ default WxStoreBaseResponse refuseGuarantee(GuaranteeRefuseRequest request) throws WxErrorException {
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreBasicService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreBasicService.java
new file mode 100644
index 0000000000..6210a9acbe
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreBasicService.java
@@ -0,0 +1,102 @@
+package com.binarywang.wxjava.store.api;
+
+import java.io.File;
+import com.binarywang.wxjava.store.bean.address.AddressCodeResponse;
+import com.binarywang.wxjava.store.bean.image.StoreImageInfo;
+import com.binarywang.wxjava.store.bean.image.StoreImageResponse;
+import com.binarywang.wxjava.store.bean.image.QualificationFileResponse;
+import com.binarywang.wxjava.store.bean.shop.ShopH5UrlResponse;
+import com.binarywang.wxjava.store.bean.shop.ShopInfoResponse;
+import com.binarywang.wxjava.store.bean.shop.ShopQrCodeResponse;
+import com.binarywang.wxjava.store.bean.shop.ShopTagLinkResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 基础接口
+ *
+ * @author Zeyes
+ */
+public interface WxStoreBasicService {
+
+ /**
+ * 获取店铺基本信息
+ *
+ * @return 店铺基本信息
+ */
+ ShopInfoResponse getShopInfo() throws WxErrorException;
+
+ /**
+ * 获取店铺H5链接
+ *
+ * @return 店铺H5链接
+ * @throws WxErrorException 异常
+ */
+ ShopH5UrlResponse getShopH5Url() throws WxErrorException;
+
+ /**
+ * 获取店铺二维码
+ *
+ * @param qrcodeType 二维码类型，1:二维码；2:标准物料；3:送礼物物料
+ * @return 店铺二维码
+ * @throws WxErrorException 异常
+ */
+ ShopQrCodeResponse getShopQrCode(int qrcodeType) throws WxErrorException;
+
+ /**
+ * 获取店铺口令
+ *
+ * @return 店铺口令
+ * @throws WxErrorException 异常
+ */
+ ShopTagLinkResponse getShopTagLink() throws WxErrorException;
+
+ /**
+ * 上传图片
+ *
+ * @param respType 0:media_id和pay_media_id；1:图片链接（商品信息相关图片请务必使用此参数得到链接）
+ * @param imgUrl 图片url
+ * @return 图片信息
+ *
+ * @throws WxErrorException 异常
+ */
+ StoreImageInfo uploadImg(int respType, String imgUrl) throws WxErrorException;
+
+ /**
+ * 上传图片
+ *
+ * @param respType 0:media_id和pay_media_id；1:图片链接（商品信息相关图片请务必使用此参数得到链接）
+ * @param file 图片文件
+ * @param height 图片的高，单位：像素
+ * @param width 图片的宽，单位：像素
+ * @return 图片信息
+ *
+ * @throws WxErrorException 异常
+ */
+ StoreImageInfo uploadImg(int respType, File file, int height, int width) throws WxErrorException;
+
+ /**
+ * 上传资质图片
+ *
+ * @param file 资质图片
+ * @return 结果
+ *
+ * @throws WxErrorException 异常
+ */
+ QualificationFileResponse uploadQualificationFile(File file) throws WxErrorException;
+
+ /**
+ * 根据media_id获取图片
+ *
+ * @param mediaId media_id
+ * @return 图片下载结果；调用方使用完 {@link StoreImageResponse#getFile()} 后必须删除该临时文件
+ */
+ StoreImageResponse getImg(String mediaId) throws WxErrorException;
+
+ /**
+ * 获取地址编码(最多获取4级)
+ *
+ * @param code 地址行政编码，不填或者填0时，拉取全国的省级行政编码
+ * @return AddressCodeResponse
+ */
+ AddressCodeResponse getAddressCode(Integer code) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreBrandService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreBrandService.java
new file mode 100644
index 0000000000..e356f84da3
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreBrandService.java
@@ -0,0 +1,103 @@
+package com.binarywang.wxjava.store.api;
+
+
+import com.binarywang.wxjava.store.bean.audit.AuditApplyResponse;
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.brand.Brand;
+import com.binarywang.wxjava.store.bean.brand.BrandApplyListResponse;
+import com.binarywang.wxjava.store.bean.brand.BrandInfoResponse;
+import com.binarywang.wxjava.store.bean.brand.BrandListResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 品牌服务接口
+ *
+ * @author Zeyes
+ */
+public interface WxStoreBrandService {
+
+ /**
+ * 获取品牌库列表
+ *
+ * @param pageSize 每页数量(默认10, 不超过50)
+ * @param nextKey 由上次请求返回, 记录翻页的上下文, 传入时会从上次返回的结果往后翻一页, 不传默认拉取第一页数据
+ * @return 品牌库列表
+ *
+ * @throws WxErrorException 异常
+ */
+ BrandListResponse listAllBrand(Integer pageSize, String nextKey) throws WxErrorException;
+
+ /**
+ * 新增品牌资质
+ *
+ * @param brand 品牌参数
+ * @return 审核id
+ *
+ * @throws WxErrorException 异常
+ */
+ AuditApplyResponse addBrandApply(Brand brand) throws WxErrorException;
+
+ /**
+ * 修改品牌资质
+ *
+ * @param brand 品牌参数
+ * @return 审核id
+ *
+ * @throws WxErrorException 异常
+ */
+ AuditApplyResponse updateBrandApply(Brand brand) throws WxErrorException;
+
+ /**
+ * 撤回品牌资质审核
+ *
+ * @param brandId 品牌id
+ * @param auditId 审核id
+ * @return 审核id
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse cancelBrandApply(String brandId, String auditId) throws WxErrorException;
+
+ /**
+ * 删除品牌资质
+ *
+ * @param brandId 品牌id
+ * @return 结果
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse deleteBrandApply(String brandId) throws WxErrorException;
+
+ /**
+ * 获取品牌资质申请详情
+ *
+ * @param brandId 品牌id
+ * @return 品牌信息
+ *
+ * @throws WxErrorException 异常
+ */
+ BrandInfoResponse getBrandApply(String brandId) throws WxErrorException;
+
+ /**
+ * 获取品牌资质申请列表
+ *
+ * @param pageSize 每页数量(默认10, 不超过50)
+ * @param nextKey 由上次请求返回, 记录翻页的上下文, 传入时会从上次返回的结果往后翻一页, 不传默认拉取第一页数据
+ * @param status 审核单状态, 不填默认拉全部商品
+ * @return 品牌列表
+ *
+ * @throws WxErrorException 异常
+ */
+ BrandApplyListResponse listBrandApply(Integer pageSize, String nextKey, Integer status) throws WxErrorException;
+
+ /**
+ * 获取生效中的品牌资质列表
+ *
+ * @param pageSize 每页数量(默认10, 不超过50)
+ * @param nextKey 由上次请求返回, 记录翻页的上下文, 传入时会从上次返回的结果往后翻一页, 不传默认拉取第一页数据
+ * @return 品牌列表
+ *
+ * @throws WxErrorException 异常
+ */
+ BrandApplyListResponse listValidBrandApply(Integer pageSize, String nextKey) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCategoryService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCategoryService.java
new file mode 100644
index 0000000000..11e71408e5
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCategoryService.java
@@ -0,0 +1,132 @@
+package com.binarywang.wxjava.store.api;
+
+import java.io.File;
+import java.util.List;
+import com.binarywang.wxjava.store.bean.audit.AuditApplyResponse;
+import com.binarywang.wxjava.store.bean.audit.AuditResponse;
+import com.binarywang.wxjava.store.bean.audit.CategoryAuditInfo;
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.category.*;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 商品类目相关接口
+ *
+ * @author Zeyes
+ * @see 新旧类目树差异
+ */
+public interface WxStoreCategoryService {
+
+ /**
+ * 获取所有的类目
+ *
+ * @return 所有类目以及资质信息
+ *
+ * @throws WxErrorException 异常
+ */
+ CategoryQualificationResponse listAllCategory() throws WxErrorException;
+
+ /**
+ * 获取商品类目列表(全量) 有频率限制
+ *
+ * @param fCatId 类目父id
+ * @return 类目列表
+ *
+ * @throws WxErrorException 异常
+ * @deprecated 接口返回更新，请使用 {@link #listAvailableCategories(String)}
+ */
+ @Deprecated
+ List listAvailableCategory(String fCatId) throws WxErrorException;
+
+ /**
+ * 获取可用的子类目详情
+ *
+ * 1.f_cat_id 为旧类目树中的非叶子类目，仅设置 cat_list 字段。
+ * 2.f_cat_id 为新类目树中的非叶子类目，仅设置 cat_list_v2 字段。
+ * 3.f_cat_id 为0，同时设置 cat_list 和 cat_list_v2 字段
+ *
+ * @param fCatId 父类目ID，可先填0获取根部类目
+ * @return 类目列表
+ * @throws WxErrorException 异常
+ */
+ ShopCategoryResponse listAvailableCategories(String fCatId) throws WxErrorException;
+
+ /**
+ * 获取类目信息
+ *
+ * @param id 三级类目id
+ * @return 类目信息
+ *
+ * @throws WxErrorException 异常
+ */
+ CategoryDetailResult getCategoryDetail(String id) throws WxErrorException;
+
+ /**
+ * 上传类目资质
+ *
+ * @param level1 一级类目ID
+ * @param level2 二级类目ID
+ * @param level3 三级类目ID
+ * @param certificate 资质材料，图片mediaid，图片类型，最多不超过10张
+ * @return 审核id
+ *
+ * @throws WxErrorException 异常
+ * @see WxStoreBasicService#uploadQualificationFile(File)
+ * @deprecated 请使用 {@link #addCategory(CategoryAuditInfo)}
+ */
+ @Deprecated
+ AuditApplyResponse addCategory(String level1, String level2, String level3, List certificate)
+ throws WxErrorException;
+
+ /**
+ * 上传类目资质
+ *
+ * @param info 类目资质信息
+ * @return 审核id
+ *
+ * @throws WxErrorException 异常
+ * @see WxStoreBasicService#uploadQualificationFile(File)
+ */
+ AuditApplyResponse addCategory(CategoryAuditInfo info) throws WxErrorException;
+
+ /**
+ * 取消类目提审
+ *
+ * @param auditId 提交审核时返回的id
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse cancelCategoryAudit(String auditId) throws WxErrorException;
+
+ /**
+ * 查询类目审核结果
+ *
+ * @param auditId 审核id
+ * @return 审核结果
+ *
+ * @throws WxErrorException 异常
+ */
+ AuditResponse getAudit(String auditId) throws WxErrorException;
+
+ /**
+ * 获取账号申请通过的类目和资质信息
+ *
+ * @return 类目和资质信息
+ *
+ * @throws WxErrorException 异常
+ */
+ PassCategoryResponse listPassCategory() throws WxErrorException;
+
+ /**
+ * 获取店铺的类目权限列表
+ *
+ * @param isFilterStatus 是否按状态筛选
+ * @param status 类目状态(当 isFilterStatus 为 true 时有效)
+ * @return 类目权限列表
+ *
+ * @throws WxErrorException 异常
+ */
+ RelationCategoryResponse listRelationCategory(Boolean isFilterStatus, Integer status) throws WxErrorException;
+
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCompassShopService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCompassShopService.java
new file mode 100644
index 0000000000..69e1fbdfd0
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCompassShopService.java
@@ -0,0 +1,126 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.compass.shop.FinderAuthListResponse;
+import com.binarywang.wxjava.store.bean.compass.shop.FinderListResponse;
+import com.binarywang.wxjava.store.bean.compass.shop.FinderOverallResponse;
+import com.binarywang.wxjava.store.bean.compass.shop.FinderProductListResponse;
+import com.binarywang.wxjava.store.bean.compass.shop.FinderProductOverallResponse;
+import com.binarywang.wxjava.store.bean.compass.shop.ShopLiveListResponse;
+import com.binarywang.wxjava.store.bean.compass.shop.ShopOverallResponse;
+import com.binarywang.wxjava.store.bean.compass.shop.ShopProductDataResponse;
+import com.binarywang.wxjava.store.bean.compass.shop.ShopProductListResponse;
+import com.binarywang.wxjava.store.bean.compass.shop.ShopSaleProfileDataResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 罗盘商家版服务
+ *
+ * @author Zeyes
+ */
+public interface WxStoreCompassShopService {
+
+ /**
+ * 获取电商概览数据
+ *
+ * @param ds 日期，格式 yyyyMMdd
+ * @return 电商概览数据
+ *
+ * @throws WxErrorException 异常
+ */
+ ShopOverallResponse getShopOverall(String ds) throws WxErrorException;
+
+ /**
+ * 获取授权视频号列表
+ *
+ * @return 获取授权视频号列表
+ *
+ * @throws WxErrorException 异常
+ */
+ FinderAuthListResponse getFinderAuthorizationList() throws WxErrorException;
+
+ /**
+ * 获取带货达人列表
+ *
+ * @param ds 日期，格式 yyyyMMdd
+ * @return 带货达人列表
+ *
+ * @throws WxErrorException 异常
+ */
+ FinderListResponse getFinderList(String ds) throws WxErrorException;
+
+ /**
+ * 获取带货数据概览
+ *
+ * @param ds 日期，格式 yyyyMMdd
+ * @return 带货数据概览
+ *
+ * @throws WxErrorException 异常
+ */
+ FinderOverallResponse getFinderOverall(String ds) throws WxErrorException;
+
+ /**
+ * 获取带货达人商品列表
+ *
+ * @param ds 日期，格式YYYYMMDD
+ * @param finderId 视频号ID
+ * @return 带货达人商品列表
+ *
+ * @throws WxErrorException 异常
+ */
+ FinderProductListResponse getFinderProductList(String ds, String finderId) throws WxErrorException;
+
+ /**
+ * 获取带货达人详情
+ *
+ * @param ds 日期，格式YYYYMMDD
+ * @param finderId 视频号ID
+ * @return 带货达人详情
+ *
+ * @throws WxErrorException 异常
+ */
+ FinderProductOverallResponse getFinderProductOverall(String ds, String finderId) throws WxErrorException;
+
+ /**
+ * 获取店铺开播列表
+ *
+ * @param ds 日期，格式YYYYMMDD
+ * @param finderId 视频号ID
+ * @return 店铺开播列表
+ *
+ * @throws WxErrorException 异常
+ */
+ ShopLiveListResponse getShopLiveList(String ds, String finderId) throws WxErrorException;
+
+ /**
+ * 获取商品详细信息
+ *
+ * @param ds 日期，格式YYYYMMDD
+ * @param productId 商品id
+ * @return 商品详细信息
+ *
+ * @throws WxErrorException 异常
+ */
+ ShopProductDataResponse getShopProductData(String ds, String productId) throws WxErrorException;
+
+ /**
+ * 获取商品列表
+ *
+ * @param ds 日期，格式YYYYMMDD
+ * @return 商品列表
+ *
+ * @throws WxErrorException 异常
+ */
+ ShopProductListResponse getShopProductList(String ds) throws WxErrorException;
+
+ /**
+ * 获取店铺人群数据
+ *
+ * @param ds 日期，格式 yyyyMMdd
+ * @param type 用户类型，1商品曝光用户 2商品点击用户 3购买用户 4首购用户 5复购用户
+ * @return 店铺人群数据
+ *
+ * @throws WxErrorException 异常
+ */
+ ShopSaleProfileDataResponse getShopSaleProfileData(String ds, Integer type) throws WxErrorException;
+
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCooperationService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCooperationService.java
new file mode 100644
index 0000000000..46c168622a
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCooperationService.java
@@ -0,0 +1,70 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.cooperation.CooperationListResponse;
+import com.binarywang.wxjava.store.bean.cooperation.CooperationQrCodeResponse;
+import com.binarywang.wxjava.store.bean.cooperation.CooperationStatusResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 合作账号相关接口
+ *
+ * @author Zeyes
+ * @see 合作账号状态机
+ */
+public interface WxStoreCooperationService {
+
+ /**
+ * 获取合作账号列表
+ *
+ * @param sharerType 合作账号类型 2公众号 3小程序
+ * @return 合作账号列表
+ *
+ * @throws WxErrorException 异常
+ */
+ CooperationListResponse listCooperation(Integer sharerType) throws WxErrorException;
+
+ /**
+ * 获取合作账号状态
+ *
+ * @param sharerId 合作账号id 公众号: gh_开头id 小程序: appid
+ * @param sharerType 合作账号类型 2公众号 3小程序
+ * @return 合作账号状态
+ *
+ * @throws WxErrorException 异常
+ */
+ CooperationStatusResponse getCooperationStatus(String sharerId, Integer sharerType) throws WxErrorException;
+
+ /**
+ * 生成合作账号邀请二维码
+ *
+ * @param sharerId 合作账号id 公众号: gh_开头id 小程序: appid
+ * @param sharerType 合作账号类型 2公众号 3小程序
+ * @return 二维码
+ *
+ * @throws WxErrorException 异常
+ */
+ CooperationQrCodeResponse generateQrCode(String sharerId, Integer sharerType) throws WxErrorException;
+
+ /**
+ * 取消合作账号邀请
+ *
+ * @param sharerId 合作账号id 公众号: gh_开头id 小程序: appid
+ * @param sharerType 合作账号类型 2公众号 3小程序
+ * @return WxStoreBaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse cancelInvitation(String sharerId, Integer sharerType) throws WxErrorException;
+
+ /**
+ * 解绑合作账号
+ *
+ * @param sharerId 合作账号id 公众号: gh_开头id 小程序: appid
+ * @param sharerType 合作账号类型 2公众号 3小程序
+ * @return WxStoreBaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse unbind(String sharerId, Integer sharerType) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCouponService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCouponService.java
new file mode 100644
index 0000000000..010fab1991
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreCouponService.java
@@ -0,0 +1,92 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.coupon.CouponIdResponse;
+import com.binarywang.wxjava.store.bean.coupon.CouponInfoResponse;
+import com.binarywang.wxjava.store.bean.coupon.CouponListParam;
+import com.binarywang.wxjava.store.bean.coupon.CouponListResponse;
+import com.binarywang.wxjava.store.bean.coupon.CouponParam;
+import com.binarywang.wxjava.store.bean.coupon.UserCouponListParam;
+import com.binarywang.wxjava.store.bean.coupon.UserCouponListResponse;
+import com.binarywang.wxjava.store.bean.coupon.UserCouponResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 优惠券服务
+ *
+ * @author Zeyes
+ */
+public interface WxStoreCouponService {
+
+ /**
+ * 创建优惠券
+ *
+ * @param coupon 优惠券
+ * @return 优惠券ID
+ *
+ * @throws WxErrorException 异常
+ */
+ CouponIdResponse createCoupon(CouponParam coupon) throws WxErrorException;
+
+ /**
+ * 更新优惠券
+ *
+ * @param coupon 优惠券
+ * @return 优惠券ID
+ *
+ * @throws WxErrorException 异常
+ */
+ CouponIdResponse updateCoupon(CouponParam coupon) throws WxErrorException;
+
+ /**
+ * 更新优惠券状态
+ *
+ * @param couponId 优惠券ID
+ * @param status 状态 2生效 4已作废 5删除 {@link com.binarywang.wxjava.store.enums.WxCouponStatus}
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateCouponStatus(String couponId, Integer status) throws WxErrorException;
+
+ /**
+ * 获取优惠券详情
+ *
+ * @param couponId 优惠券ID
+ * @return CouponInfoResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ CouponInfoResponse getCoupon(String couponId) throws WxErrorException;
+
+ /**
+ * 获取优惠券ID列表
+ *
+ * @param param 条件参数
+ * @return 优惠券ID列表
+ *
+ * @throws WxErrorException 异常
+ */
+ CouponListResponse getCouponList(CouponListParam param) throws WxErrorException;
+
+ /**
+ * 获取用户优惠券
+ *
+ * @param openId 用户openid
+ * @param userCouponId 用户优惠券ID
+ * @return UserCouponResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ UserCouponResponse getUserCoupon(String openId, String userCouponId) throws WxErrorException;
+
+ /**
+ * 获取用户优惠券ID列表
+ *
+ * @param param 条件参数
+ * @return UserCouponListResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ UserCouponListResponse getUserCouponList(UserCouponListParam param) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreEwaybillService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreEwaybillService.java
new file mode 100644
index 0000000000..533de1afbb
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreEwaybillService.java
@@ -0,0 +1,78 @@
+package com.binarywang.wxjava.store.api;
+
+import java.util.List;
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.ewaybill.AccountInfoResponse;
+import com.binarywang.wxjava.store.bean.ewaybill.AddSubOrderRequest;
+import com.binarywang.wxjava.store.bean.ewaybill.CreateOrderRequest;
+import com.binarywang.wxjava.store.bean.ewaybill.CreateOrderResponse;
+import com.binarywang.wxjava.store.bean.ewaybill.DeliveryListResponse;
+import com.binarywang.wxjava.store.bean.ewaybill.PrintOrderRequest;
+import com.binarywang.wxjava.store.bean.ewaybill.BatchPrintOrderRequest;
+import com.binarywang.wxjava.store.bean.ewaybill.OrderDetailResponse;
+import com.binarywang.wxjava.store.bean.ewaybill.PreCreateRequest;
+import com.binarywang.wxjava.store.bean.ewaybill.PreCreateResponse;
+import com.binarywang.wxjava.store.bean.ewaybill.PrintContentResponse;
+import com.binarywang.wxjava.store.bean.ewaybill.TemplateConfigResponse;
+import com.binarywang.wxjava.store.bean.ewaybill.TemplateCreateRequest;
+import com.binarywang.wxjava.store.bean.ewaybill.TemplateIdResponse;
+import com.binarywang.wxjava.store.bean.ewaybill.TemplateInfoResponse;
+import com.binarywang.wxjava.store.bean.ewaybill.TemplateUpdateRequest;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店电子面单服务接口
+ *
+ * @author GitHub Copilot
+ */
+public interface WxStoreEwaybillService {
+
+ /** 获取可用的标准面单模板。 @return 模板配置 @throws WxErrorException 微信接口调用失败 */
+ TemplateConfigResponse getTemplateConfig() throws WxErrorException;
+
+ /** 创建商家面单模板。 @param req 官方模板创建字段 @return 新模板 ID @throws WxErrorException 调用失败 */
+ TemplateIdResponse createTemplate(TemplateCreateRequest req) throws WxErrorException;
+
+ /** 删除商家面单模板。 @param templateId 模板 ID @return 操作结果 @throws WxErrorException 调用失败 */
+ WxStoreBaseResponse deleteTemplate(String templateId) throws WxErrorException;
+
+ /** 更新商家面单模板。 @param req 官方模板更新字段 @return 操作结果 @throws WxErrorException 调用失败 */
+ WxStoreBaseResponse updateTemplate(TemplateUpdateRequest req) throws WxErrorException;
+
+ /** 查询标准模板信息。 @param templateCode 标准模板编码 @return 模板详情 @throws WxErrorException 调用失败 */
+ TemplateInfoResponse getTemplate(String templateCode) throws WxErrorException;
+
+ /** 按模板 ID 查询商家模板。 @param templateId 模板 ID @return 模板详情 @throws WxErrorException 调用失败 */
+ TemplateInfoResponse getTemplateById(String templateId) throws WxErrorException;
+
+ /** 查询已开通电子面单的网点和账号。 @return 账号信息 @throws WxErrorException 调用失败 */
+ AccountInfoResponse getAccount() throws WxErrorException;
+
+ /** 查询已开通电子面单的快递公司。 @return 快递公司列表 @throws WxErrorException 调用失败 */
+ DeliveryListResponse getDeliveryList() throws WxErrorException;
+
+ /** 预取电子面单号。 @param req 官方预取号字段 @return 预取号结果 @throws WxErrorException 调用失败 */
+ PreCreateResponse preCreateOrder(PreCreateRequest req) throws WxErrorException;
+
+ /** 获取电子面单号。 @param req 官方取号字段，含收寄件信息 @return 面单号结果 @throws WxErrorException 调用失败 */
+ CreateOrderResponse createOrder(CreateOrderRequest req) throws WxErrorException;
+
+ /** 追加电子面单子件。 @param req 官方子件字段 @return 操作结果 @throws WxErrorException 调用失败 */
+ WxStoreBaseResponse addSubOrder(AddSubOrderRequest req) throws WxErrorException;
+
+ /** 取消电子面单下单。 @param waybillId 运单 ID @return 操作结果 @throws WxErrorException 调用失败 */
+ WxStoreBaseResponse cancelOrder(PrintOrderRequest req) throws WxErrorException;
+
+ /** 查询电子面单详情。 @param waybillId 运单 ID @return 面单详情 @throws WxErrorException 调用失败 */
+ OrderDetailResponse getOrder(String ewaybillOrderId) throws WxErrorException;
+
+ /** 获取打印报文。 @param waybillIds 运单 ID 列表 @param templateId 可选模板 ID @return 打印内容 @throws WxErrorException 调用失败 */
+ PrintContentResponse getPrintContent(String ewaybillOrderId, String templateId)
+ throws WxErrorException;
+
+ /** 通知单个运单打印成功。 @param waybillId 运单 ID @return 操作结果 @throws WxErrorException 调用失败 */
+ WxStoreBaseResponse printOrder(PrintOrderRequest req) throws WxErrorException;
+
+ /** 批量通知运单打印成功。 @param waybillIds 运单 ID 列表 @return 操作结果 @throws WxErrorException 调用失败 */
+ WxStoreBaseResponse batchPrintOrder(BatchPrintOrderRequest req) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreFavoriteService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreFavoriteService.java
new file mode 100644
index 0000000000..82779e32f8
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreFavoriteService.java
@@ -0,0 +1,21 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.favorite.FavoriteCountResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 收藏管理接口
+ *
+ * @author GitHub Copilot
+ * @link 收藏管理接口文档
+ */
+public interface WxStoreFavoriteService {
+
+ /**
+ * 获取店铺收藏的人数
+ *
+ * @return 店铺收藏人数响应
+ * @throws WxErrorException 异常
+ */
+ FavoriteCountResponse getFavoriteCount() throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreFreightTemplateService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreFreightTemplateService.java
new file mode 100644
index 0000000000..6fce17f7d4
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreFreightTemplateService.java
@@ -0,0 +1,57 @@
+package com.binarywang.wxjava.store.api;
+
+
+import com.binarywang.wxjava.store.bean.freight.FreightTemplate;
+import com.binarywang.wxjava.store.bean.freight.TemplateIdResponse;
+import com.binarywang.wxjava.store.bean.freight.TemplateInfoResponse;
+import com.binarywang.wxjava.store.bean.freight.TemplateListResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 运费模板服务接口
+ *
+ * @author Zeyes
+ */
+public interface WxStoreFreightTemplateService {
+
+ /**
+ * 获取运费模板列表
+ *
+ * @param offset 起始位置
+ * @param limit 拉取个数
+ * @return 列表
+ *
+ * @throws WxErrorException 异常
+ */
+ TemplateListResponse listTemplate(Integer offset, Integer limit) throws WxErrorException;
+
+ /**
+ * 获取运费模板
+ *
+ * @param templateId 模板id
+ * @return 运费模板
+ *
+ * @throws WxErrorException 异常
+ */
+ TemplateInfoResponse getTemplate(String templateId) throws WxErrorException;
+
+ /**
+ * 添加运费模板
+ *
+ * @param template 运费模板
+ * @return TemplateIdResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ TemplateIdResponse addTemplate(FreightTemplate template) throws WxErrorException;
+
+ /**
+ * 更新运费模板
+ *
+ * @param template 运费模板
+ * @return TemplateIdResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ TemplateIdResponse updateTemplate(FreightTemplate template) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreFundService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreFundService.java
new file mode 100644
index 0000000000..520b5cc712
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreFundService.java
@@ -0,0 +1,189 @@
+package com.binarywang.wxjava.store.api;
+
+
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.fund.AccountInfo;
+import com.binarywang.wxjava.store.bean.fund.AccountInfoResponse;
+import com.binarywang.wxjava.store.bean.fund.BalanceInfoResponse;
+import com.binarywang.wxjava.store.bean.fund.FlowListResponse;
+import com.binarywang.wxjava.store.bean.fund.FundsFlowResponse;
+import com.binarywang.wxjava.store.bean.fund.FundsListParam;
+import com.binarywang.wxjava.store.bean.fund.WithdrawDetailResponse;
+import com.binarywang.wxjava.store.bean.fund.WithdrawListResponse;
+import com.binarywang.wxjava.store.bean.fund.WithdrawSubmitResponse;
+import com.binarywang.wxjava.store.bean.fund.bank.BankCityResponse;
+import com.binarywang.wxjava.store.bean.fund.bank.BankInfoResponse;
+import com.binarywang.wxjava.store.bean.fund.bank.BankListResponse;
+import com.binarywang.wxjava.store.bean.fund.bank.BankProvinceResponse;
+import com.binarywang.wxjava.store.bean.fund.bank.BranchInfoResponse;
+import com.binarywang.wxjava.store.bean.fund.qrcode.QrCheckResponse;
+import com.binarywang.wxjava.store.bean.fund.qrcode.QrCodeResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 资金相关服务
+ *
+ * @author Zeyes
+ */
+public interface WxStoreFundService {
+
+ /**
+ * 获取账户余额
+ *
+ * @return 账户余额
+ *
+ * @throws WxErrorException 异常
+ */
+ BalanceInfoResponse getBalance() throws WxErrorException;
+
+ /**
+ * 获取结算账户
+ *
+ * @return 结算账户
+ *
+ * @throws WxErrorException 异常
+ */
+ AccountInfoResponse getBankAccount() throws WxErrorException;
+
+ /**
+ * 获取资金流水详情
+ *
+ * @param flowId 资金流水号
+ * @return 资金流水详情
+ *
+ * @throws WxErrorException 异常
+ */
+ FundsFlowResponse getFundsFlowDetail(String flowId) throws WxErrorException;
+
+ /**
+ * 获取资金流水列表
+ *
+ * @param param 资金流水列表参数
+ * @return 资金流水列表
+ *
+ * @throws WxErrorException 异常
+ */
+ FlowListResponse listFundsFlow(FundsListParam param) throws WxErrorException;
+
+ /**
+ * 获取提现记录
+ *
+ * @param withdrawId 提现单号
+ * @return 提现记录
+ *
+ * @throws WxErrorException 异常
+ */
+ WithdrawDetailResponse getWithdrawDetail(String withdrawId) throws WxErrorException;
+
+ /**
+ * 获取提现记录列表
+ *
+ * @param pageNum 页码
+ * @param pageSize 每页大小
+ * @param startTime 开始时间
+ * @param endTime 结束时间
+ * @return 提现记录列表
+ *
+ * @throws WxErrorException 异常
+ */
+ WithdrawListResponse listWithdraw(Integer pageNum, Integer pageSize, Long startTime, Long endTime)
+ throws WxErrorException;
+
+ /**
+ * 修改结算账户
+ *
+ * @param accountInfo 结算账户信息
+ * @return 修改结果
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse setBankAccount(AccountInfo accountInfo) throws WxErrorException;
+
+ /***
+ * 商户提现
+ *
+ * @param amount 提现金额（单位：分）
+ * @param remark 提现备注
+ * @param bankMemo 银行附言
+ * @return 提现结果
+ * @throws WxErrorException 异常
+ */
+ WithdrawSubmitResponse submitWithdraw(Integer amount, String remark, String bankMemo) throws WxErrorException;
+
+ /**
+ * 根据卡号查银行信息
+ *
+ * @param accountNumber 卡号
+ * @return 银行信息
+ *
+ * @throws WxErrorException 异常
+ */
+ BankInfoResponse getBankInfoByCardNo(String accountNumber) throws WxErrorException;
+
+ /**
+ * 搜索银行列表
+ *
+ * @param offset 偏移量
+ * @param limit 每页数据大小
+ * @param keywords 银行关键字
+ * @param bankType 银行类型(1:对私银行,2:对公银行; 默认对公)
+ * @return 银行列表
+ *
+ * @throws WxErrorException 异常
+ */
+ BankListResponse searchBankList(Integer offset, Integer limit, String keywords, Integer bankType)
+ throws WxErrorException;
+
+ /**
+ * 查询城市列表
+ *
+ * @param provinceCode 省份编码
+ * @return 城市列表
+ *
+ * @throws WxErrorException 异常
+ */
+ BankCityResponse searchCityList(String provinceCode) throws WxErrorException;
+
+ /**
+ * 查询大陆银行省份列表
+ *
+ * @return 省份列表
+ *
+ * @throws WxErrorException 异常
+ */
+ BankProvinceResponse getProvinceList() throws WxErrorException;
+
+ /**
+ * 查询支行列表
+ *
+ * @param bankCode 银行编码
+ * @param cityCode 城市编码
+ * @param offset 偏移量
+ * @param limit 每页数据大小
+ * @return 支行列表
+ *
+ * @throws WxErrorException 异常
+ */
+ BranchInfoResponse searchBranchList(String bankCode, String cityCode, Integer offset, Integer limit)
+ throws WxErrorException;
+
+ /**
+ * 获取二维码
+ *
+ * @param qrcodeTicket 二维码ticket
+ * @return 二维码响应
+ *
+ * @throws WxErrorException 异常
+ */
+ QrCodeResponse getQrCode(String qrcodeTicket) throws WxErrorException;
+
+ /**
+ * 查询扫码状态
+ *
+ * @param qrcodeTicket 二维码ticket
+ * @return 扫码状态
+ *
+ * @throws WxErrorException 异常
+ */
+ QrCheckResponse checkQrStatus(String qrcodeTicket) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreGiftService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreGiftService.java
new file mode 100644
index 0000000000..eff2e8fecb
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreGiftService.java
@@ -0,0 +1,102 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.product.GiftActivityAddResponse;
+import com.binarywang.wxjava.store.bean.product.GiftActivityInfo;
+import com.binarywang.wxjava.store.bean.product.GiftProductAddResponse;
+import com.binarywang.wxjava.store.bean.product.GiftProductGetResponse;
+import com.binarywang.wxjava.store.bean.product.GiftProductInfo;
+import com.binarywang.wxjava.store.bean.product.GiftProductListParam;
+import com.binarywang.wxjava.store.bean.product.GiftProductListResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店赠品与买赠活动服务。
+ */
+public interface WxStoreGiftService {
+
+ /**
+ * 添加非卖商品。
+ *
+ * @param info 赠品信息
+ * @return 添加赠品响应
+ * @throws WxErrorException 异常
+ */
+ GiftProductAddResponse addGiftProduct(GiftProductInfo info) throws WxErrorException;
+
+ /**
+ * 更新非卖商品。
+ *
+ * @param info 赠品信息
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateGiftProduct(GiftProductInfo info) throws WxErrorException;
+
+ /**
+ * 在售商品转赠品。
+ *
+ * @param productId 商品ID
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse setProductAsGift(String productId) throws WxErrorException;
+
+ /**
+ * 获取赠品。
+ *
+ * @param productId 赠品商品ID
+ * @return 赠品详情响应
+ * @throws WxErrorException 异常
+ */
+ GiftProductGetResponse getGiftProduct(String productId) throws WxErrorException;
+
+ /**
+ * 获取赠品列表。
+ *
+ * @param param 查询参数
+ * @return 赠品列表
+ * @throws WxErrorException 异常
+ */
+ GiftProductListResponse listGiftProduct(GiftProductListParam param) throws WxErrorException;
+
+ /**
+ * 更新赠品库存。
+ *
+ * @param productId 赠品商品ID
+ * @param skuId 赠品sku_id
+ * @param diffType 修改类型 1增加 2减少 3设置
+ * @param num 增加、减少或者设置的库存值
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateGiftStock(String productId, String skuId, Integer diffType, Integer num)
+ throws WxErrorException;
+
+ /**
+ * 创建赠品活动。
+ *
+ * @param info 活动信息
+ * @return 创建赠品活动响应
+ * @throws WxErrorException 异常
+ */
+ GiftActivityAddResponse addGiftActivity(GiftActivityInfo info) throws WxErrorException;
+
+ /**
+ * 删除赠品活动。
+ *
+ * @param activityId 活动ID
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse deleteGiftActivity(String activityId) throws WxErrorException;
+
+ /**
+ * 停止赠品活动。
+ *
+ * @param activityId 活动ID
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse stopGiftActivity(String activityId) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreHomePageService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreHomePageService.java
new file mode 100644
index 0000000000..794c662431
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreHomePageService.java
@@ -0,0 +1,188 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.home.background.BackgroundApplyResponse;
+import com.binarywang.wxjava.store.bean.home.background.BackgroundGetResponse;
+import com.binarywang.wxjava.store.bean.home.banner.BannerApplyResponse;
+import com.binarywang.wxjava.store.bean.home.banner.BannerGetResponse;
+import com.binarywang.wxjava.store.bean.home.banner.BannerInfo;
+import com.binarywang.wxjava.store.bean.home.tree.TreeProductEditInfo;
+import com.binarywang.wxjava.store.bean.home.tree.TreeProductListInfo;
+import com.binarywang.wxjava.store.bean.home.tree.TreeProductListResponse;
+import com.binarywang.wxjava.store.bean.home.tree.TreeShowGetResponse;
+import com.binarywang.wxjava.store.bean.home.tree.TreeShowInfo;
+import com.binarywang.wxjava.store.bean.home.tree.TreeShowSetResponse;
+import com.binarywang.wxjava.store.bean.home.window.WindowProductSettingResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 主页管理相关接口
+ *
+ * @author Zeyes
+ */
+public interface WxStoreHomePageService {
+
+ /**
+ * 添加分类关联的商品
+ *
+ * @param info 商品分类以及商品id
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse addTreeProduct(TreeProductEditInfo info) throws WxErrorException;
+
+ /**
+ * 删除分类关联的商品
+ *
+ * @param info 商品分类以及商品id
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse delTreeProduct(TreeProductEditInfo info) throws WxErrorException;
+
+ /**
+ * 获取分类关联的商品ID列表
+ *
+ * @param info 分类id、分页大小、分页上下文
+ * @return 商品id、分页上下文
+ *
+ * @throws WxErrorException 异常
+ */
+ TreeProductListResponse getTreeProductList(TreeProductListInfo info) throws WxErrorException;
+
+ /**
+ * 设置展示在店铺主页的商品分类
+ *
+ * @param info 分类id
+ * @return 商品分类审核结果
+ *
+ * @throws WxErrorException 异常
+ */
+ TreeShowSetResponse setShowTree(TreeShowInfo info) throws WxErrorException;
+
+ /**
+ * 获取展示在店铺主页的商品分类
+ *
+ * @return 商品分类信息
+ *
+ * @throws WxErrorException 异常
+ */
+ TreeShowGetResponse getShowTree() throws WxErrorException;
+
+ /**
+ * 获取主页展示商品列表
+ *
+ * @param pageSize 分页大小
+ * @param nextKey 分页上下文
+ * @return WindowProductSettingResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WindowProductSettingResponse listWindowProduct(Integer pageSize, String nextKey) throws WxErrorException;
+
+ /**
+ * 删除主页展示商品
+ *
+ * @param productId 商品id
+ * @param indexNum 商品重新排序后的新序号，最大移动步长为500（即新序号与当前序号的距离小于500）
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse reorderWindowProduct(String productId, Integer indexNum) throws WxErrorException;
+
+ /**
+ * 隐藏小店主页商品
+ *
+ * @param productId 商品id
+ * @param setHide 是否隐藏。1-隐藏，0-取消隐藏
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse hideWindowProduct(String productId, Integer setHide) throws WxErrorException;
+
+ /**
+ * 置顶小店主页商品
+ *
+ * @param productId 商品id
+ * @param setTop 是否顶置。1-置顶，0-取消置顶
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse topWindowProduct(String productId, Integer setTop) throws WxErrorException;
+
+ /**
+ * 提交背景图申请
+ *
+ * @param imgUrl 图片链接。请务必使用接口上传图片（参数resp_type=1），并将返回的img_url填入此处，不接受其他任何格式的图片url。
+ * 若url曾经做过转换（url前缀为mmecimage.cn/p/），则可以直接提交。
+ * @return 申请编号
+ *
+ * @throws WxErrorException 异常
+ * @see WxStoreBasicService#uploadImg(int, String)
+ */
+ BackgroundApplyResponse applyBackground(String imgUrl) throws WxErrorException;
+
+ /**
+ * 查询背景图
+ *
+ * @return 背景图信息
+ * @throws WxErrorException 异常
+ */
+ BackgroundGetResponse getBackground() throws WxErrorException;
+
+ /**
+ * 撤销主页背景图申请
+ *
+ * @param applyId 申请编号
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse cancelBackground(Integer applyId) throws WxErrorException;
+
+ /**
+ * 清空主页背景图并撤销流程中的申请
+ *
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse removeBackground() throws WxErrorException;
+
+ /**
+ * 提交精选展示位申请
+ *
+ * @param info 展示位信息
+ * @return 申请编号
+ * @throws WxErrorException 异常
+ */
+ BannerApplyResponse applyBanner(BannerInfo info) throws WxErrorException;
+
+ /**
+ * 查询精选展示位
+ *
+ * @return 展示位信息
+ * @throws WxErrorException 异常
+ */
+ BannerGetResponse getBanner() throws WxErrorException;
+
+ /**
+ * 撤销精选展示位申请
+ *
+ * @param applyId 申请编号
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse cancelBanner(Integer applyId) throws WxErrorException;
+
+ /**
+ * 清空精选展示位并撤销流程中的申请
+ *
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse removeBanner() throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreKfService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreKfService.java
new file mode 100644
index 0000000000..5cadd89dc4
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreKfService.java
@@ -0,0 +1,41 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.kf.WxStoreKfSendMsgParam;
+import com.binarywang.wxjava.store.bean.kf.WxStoreKfSendMsgResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/** 微信小店商家客服服务。 */
+public interface WxStoreKfService {
+
+ /**
+ * 上传多媒体资源。
+ *
+ * @param openId 用户 open_id
+ * @param msgType 文件类型，仅支持 video、file、image
+ * @param file 文件字节内容
+ * @return COS 地址
+ * @throws WxErrorException 微信异常
+ */
+ String uploadMedia(String openId, String msgType, byte[] file) throws WxErrorException;
+
+ /**
+ * 上传多媒体资源。
+ *
+ * @param openId 用户 open_id
+ * @param msgType 文件类型，仅支持 video、file、image
+ * @param fileName 文件名
+ * @param file 文件字节内容
+ * @return COS 地址
+ * @throws WxErrorException 微信异常
+ */
+ String uploadMedia(String openId, String msgType, String fileName, byte[] file) throws WxErrorException;
+
+ /**
+ * 发送客服消息。
+ *
+ * @param param 请求参数
+ * @return 发送结果
+ * @throws WxErrorException 微信异常
+ */
+ WxStoreKfSendMsgResponse sendMessage(WxStoreKfSendMsgParam param) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreLimitedDiscountService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreLimitedDiscountService.java
new file mode 100644
index 0000000000..f70f590b62
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreLimitedDiscountService.java
@@ -0,0 +1,62 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.limit.LimitTaskAddResponse;
+import com.binarywang.wxjava.store.bean.limit.LimitTaskListResponse;
+import com.binarywang.wxjava.store.bean.limit.LimitTaskParam;
+import com.binarywang.wxjava.store.bean.limit.LimitTaskUpdateParam;
+import com.binarywang.wxjava.store.bean.limit.LimitTaskUpdateResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店限时抢购服务。
+ */
+public interface WxStoreLimitedDiscountService {
+
+ /**
+ * 添加限时抢购任务。
+ *
+ * @param param 限时抢购任务
+ * @return 添加任务响应
+ * @throws WxErrorException 异常
+ */
+ LimitTaskAddResponse addLimitTask(LimitTaskParam param) throws WxErrorException;
+
+ /**
+ * 拉取限时抢购任务列表。
+ *
+ * @param pageSize 每页数量
+ * @param nextKey 翻页上下文
+ * @param status 抢购活动状态
+ * @return 任务列表响应
+ * @throws WxErrorException 异常
+ */
+ LimitTaskListResponse listLimitTask(Integer pageSize, String nextKey, Integer status) throws WxErrorException;
+
+ /**
+ * 停止限时抢购任务。
+ *
+ * @param taskId 限时抢购任务ID
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse stopLimitTask(String taskId) throws WxErrorException;
+
+ /**
+ * 删除限时抢购任务。
+ *
+ * @param taskId 限时抢购任务ID
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse deleteLimitTask(String taskId) throws WxErrorException;
+
+ /**
+ * 更新限时抢购任务。
+ *
+ * @param param 更新任务参数
+ * @return 更新任务响应
+ * @throws WxErrorException 异常
+ */
+ LimitTaskUpdateResponse updateLimitTask(LimitTaskUpdateParam param) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreOrderService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreOrderService.java
new file mode 100644
index 0000000000..69c0e9bc52
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreOrderService.java
@@ -0,0 +1,326 @@
+package com.binarywang.wxjava.store.api;
+
+import java.util.List;
+import com.binarywang.wxjava.store.bean.base.AddressInfo;
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.delivery.PackageAuditInfo;
+import com.binarywang.wxjava.store.bean.delivery.DeliveryCompanyResponse;
+import com.binarywang.wxjava.store.bean.delivery.DeliveryInfo;
+import com.binarywang.wxjava.store.bean.order.ChangeOrderInfo;
+import com.binarywang.wxjava.store.bean.order.DecodeSensitiveInfoResponse;
+import com.binarywang.wxjava.store.bean.order.DeliveryUpdateParam;
+import com.binarywang.wxjava.store.bean.order.OrderCompensationDeliveryParam;
+import com.binarywang.wxjava.store.bean.order.OrderInfoResponse;
+import com.binarywang.wxjava.store.bean.order.OrderListParam;
+import com.binarywang.wxjava.store.bean.order.OrderListResponse;
+import com.binarywang.wxjava.store.bean.order.OrderSearchParam;
+import com.binarywang.wxjava.store.bean.order.PreShipmentChangeSkuResponse;
+import com.binarywang.wxjava.store.bean.order.PresentSubOrderResponse;
+import com.binarywang.wxjava.store.bean.order.PrivateNumberGetPhoneResponse;
+import com.binarywang.wxjava.store.bean.order.RealNumberViewAuditResponse;
+import com.binarywang.wxjava.store.bean.order.VirtualTelNumberResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 订单服务接口
+ *
+ * @author Zeyes
+ * @link 订单接口文档
+ */
+public interface WxStoreOrderService {
+
+ /**
+ * 获取订单
+ *
+ * @param orderId 订单id
+ * @return 订单详情
+ *
+ * @throws WxErrorException 异常
+ */
+ OrderInfoResponse getOrder(String orderId) throws WxErrorException;
+
+ /**
+ * 获取订单详情
+ *
+ * @param orderId 订单id
+ * @param encodeSensitiveInfo 是否编码敏感信息
+ * @return 订单详情
+ *
+ * @throws WxErrorException 异常
+ */
+ OrderInfoResponse getOrder(String orderId, Boolean encodeSensitiveInfo) throws WxErrorException;
+
+ /**
+ * 获取订单列表
+ *
+ * @param param 搜索条件
+ * @return 订单列表
+ *
+ * @throws WxErrorException 异常
+ */
+ OrderListResponse getOrders(OrderListParam param) throws WxErrorException;
+
+ /**
+ * 订单搜索
+ *
+ * @param param 搜索条件
+ * @return 订单列表
+ *
+ * @throws WxErrorException 异常
+ */
+ OrderListResponse searchOrder(OrderSearchParam param) throws WxErrorException;
+
+ /**
+ * 更改订单价格
+ *
+ * @param orderId 订单id
+ * @param expressFee 运费价格（以分为单位）(不填不改)
+ * @param changeOrderInfos 改价列表
+ * @return 结果
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updatePrice(String orderId, Integer expressFee, List changeOrderInfos)
+ throws WxErrorException;
+
+ /**
+ * 更改订单备注
+ *
+ * @param orderId 订单id
+ * @param merchantNotes 备注
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateRemark(String orderId, String merchantNotes) throws WxErrorException;
+
+ /**
+ * 更新订单地址
+ *
+ * @param orderId 订单id
+ * @param userAddress 用户地址
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateAddress(String orderId, AddressInfo userAddress) throws WxErrorException;
+
+ /**
+ * 修改物流信息
发货完成的订单可以修改，最多修改1次 拆包发货的订单暂不允许修改物流 虚拟商品订单暂不允许修改物流
+ *
+ * @param param 物流信息
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateDelivery(DeliveryUpdateParam param) throws WxErrorException;
+
+ /**
+ * 同意用户修改收货地址请求
+ *
+ * @param orderId 订单id
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse acceptAddressModify(String orderId) throws WxErrorException;
+
+ /**
+ * 拒接用户修改收货地址请求
+ *
+ * @param orderId 订单id
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse rejectAddressModify(String orderId) throws WxErrorException;
+
+ /**
+ * 关闭订单 （需要订单状态为未付款状态）
+ *
+ * @param orderId 订单id
+ * @return BaseResponse
+ */
+ WxStoreBaseResponse closeOrder(String orderId);
+
+ /**
+ * 获取快递公司列表-旧
+ *
+ * @return 快递公司列表
+ *
+ * @throws WxErrorException 异常
+ */
+ DeliveryCompanyResponse listDeliveryCompany() throws WxErrorException;
+
+ /**
+ * 获取快递公司列表
+ *
+ * @param ewaybillOnly 是否仅返回支持电子面单功能的快递公司
+ * @return 快递公司列表
+ *
+ * @throws WxErrorException 异常
+ */
+ DeliveryCompanyResponse listDeliveryCompany(Boolean ewaybillOnly) throws WxErrorException;
+
+ /**
+ * 订单发货
+ *
+ * @param orderId 订单id
+ * @param deliveryList 物流信息
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse deliveryOrder(String orderId, List deliveryList) throws WxErrorException;
+
+ /**
+ * 上传生鲜质检信息
+ *
+ * 注意事项：
+ * 1. 非生鲜质检的订单不能进行上传
+ * 2. 图片url必须用图片上传接口获取 {@link WxStoreBasicService#uploadImg(int, String)}
+ *
+ * @param orderId 订单id
+ * @param items 商品打包信息
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse uploadFreshInspect(String orderId, List items) throws WxErrorException;
+
+ /**
+ * 兑换虚拟号
+ *
+ * @param orderId 订单id
+ * @return 虚拟号信息
+ * @throws WxErrorException 异常
+ */
+ VirtualTelNumberResponse getVirtualTelNumber(String orderId) throws WxErrorException;
+
+ /**
+ * 解码订单包含的敏感数据
+ *
+ * @param orderId 订单id
+ * @return 解码结果
+ * @throws WxErrorException 异常
+ */
+ DecodeSensitiveInfoResponse decodeSensitiveInfo(String orderId) throws WxErrorException;
+
+ /**
+ * 礼物订单新增备注信息
+ *
+ * @param orderId 礼物订单ID
+ * @param note 备注内容
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse addPresentNote(String orderId, String note) throws WxErrorException;
+
+ /**
+ * 获取礼物单的子单列表
+ *
+ * @param orderId 礼物订单ID
+ * @return 子单列表
+ * @throws WxErrorException 异常
+ */
+ PresentSubOrderResponse getPresentSubOrders(String orderId) throws WxErrorException;
+
+ /**
+ * 获取待发货前更换SKU待处理请求
+ *
+ * @param orderId 订单ID
+ * @return 换SKU信息
+ * @throws WxErrorException 异常
+ */
+ PreShipmentChangeSkuResponse getPreShipmentChangeSku(String orderId) throws WxErrorException;
+
+ /**
+ * 同意待发货前更换SKU请求
+ *
+ * @param orderId 订单ID
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse approvePreShipmentChangeSku(String orderId) throws WxErrorException;
+
+ /**
+ * 拒绝待发货前更换SKU请求
+ *
+ * @param orderId 订单ID
+ * @param rejectReason 拒绝原因
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse rejectPreShipmentChangeSku(String orderId, String rejectReason) throws WxErrorException;
+
+ /**
+ * 申请查看订单真实号码
+ *
+ * @param orderId 订单ID
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse applyRealNumber(String orderId) throws WxErrorException;
+
+ /**
+ * 查看订单真实号审核状态
+ *
+ * @param orderId 订单ID
+ * @return 审核状态
+ * @throws WxErrorException 异常
+ */
+ RealNumberViewAuditResponse getRealNumberViewAudit(String orderId) throws WxErrorException;
+
+ /**
+ * 订单再次申请虚拟号
+ *
+ * @param orderId 订单ID
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse applyVirtualNumberAgain(String orderId) throws WxErrorException;
+
+ /**
+ * 订单虚拟号延期
+ *
+ * @param orderId 订单ID
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse delayVirtualNumber(String orderId) throws WxErrorException;
+
+ /**
+ * 添加待认证的手机号
+ *
+ * @param phone 手机号
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse addPrivatePhone(String phone) throws WxErrorException;
+
+ /**
+ * 获取短信验证码
+ *
+ * @param phone 手机号
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse sendPrivatePhoneVerifyCode(String phone) throws WxErrorException;
+
+ /**
+ * 获取小店手机号认证状态
+ *
+ * @return 手机号认证状态
+ * @throws WxErrorException 异常
+ */
+ PrivateNumberGetPhoneResponse getPrivatePhone() throws WxErrorException;
+
+ /**
+ * 订单补发货
+ *
+ * @param param 补发货参数
+ * @return BaseResponse
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse compensationDelivery(OrderCompensationDeliveryParam param) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreProductAssistantService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreProductAssistantService.java
new file mode 100644
index 0000000000..bdc7a03695
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreProductAssistantService.java
@@ -0,0 +1,77 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.product.assistant.BeginTimingSaleParam;
+import com.binarywang.wxjava.store.bean.product.assistant.CancelTimingSaleParam;
+import com.binarywang.wxjava.store.bean.product.assistant.CategoryPreCheckParam;
+import com.binarywang.wxjava.store.bean.product.assistant.CategoryPreCheckResponse;
+import com.binarywang.wxjava.store.bean.product.assistant.ExternalProductMappingNewParam;
+import com.binarywang.wxjava.store.bean.product.assistant.ExternalProductMappingNewResponse;
+import com.binarywang.wxjava.store.bean.product.assistant.ExternalProductMappingParam;
+import com.binarywang.wxjava.store.bean.product.assistant.ExternalProductMappingResponse;
+import com.binarywang.wxjava.store.bean.product.assistant.ProductBrandRecommendParam;
+import com.binarywang.wxjava.store.bean.product.assistant.ProductBrandRecommendResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店商品辅助功能服务。
+ */
+public interface WxStoreProductAssistantService {
+
+ /**
+ * 发品前校验。
+ *
+ * @param param 校验参数
+ * @return 校验结果
+ * @throws WxErrorException 异常
+ */
+ CategoryPreCheckResponse categoryPreCheck(CategoryPreCheckParam param) throws WxErrorException;
+
+ /**
+ * 获取商品品牌推荐。
+ *
+ * @param param 推荐参数
+ * @return 推荐结果
+ * @throws WxErrorException 异常
+ */
+ ProductBrandRecommendResponse getProductBrandRecommend(ProductBrandRecommendParam param)
+ throws WxErrorException;
+
+ /**
+ * 获取站内外商品属性映射。
+ *
+ * @param param 映射参数
+ * @return 映射结果
+ * @throws WxErrorException 异常
+ */
+ ExternalProductMappingResponse externalProductMapping(ExternalProductMappingParam param)
+ throws WxErrorException;
+
+ /**
+ * 获取商品属性映射及推荐。
+ *
+ * @param param 映射参数
+ * @return 映射结果
+ * @throws WxErrorException 异常
+ */
+ ExternalProductMappingNewResponse externalProductMappingNew(ExternalProductMappingNewParam param)
+ throws WxErrorException;
+
+ /**
+ * 将定时开售商品改为立即开售。
+ *
+ * @param param 开售参数
+ * @return 操作结果
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse beginTimingSale(BeginTimingSaleParam param) throws WxErrorException;
+
+ /**
+ * 取消商品定时开售。
+ *
+ * @param param 取消参数
+ * @return 操作结果
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse cancelTimingSale(CancelTimingSaleParam param) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreProductService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreProductService.java
new file mode 100644
index 0000000000..f7e5422af5
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreProductService.java
@@ -0,0 +1,480 @@
+package com.binarywang.wxjava.store.api;
+
+
+import java.util.List;
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.limit.LimitTaskAddResponse;
+import com.binarywang.wxjava.store.bean.limit.LimitTaskListResponse;
+import com.binarywang.wxjava.store.bean.limit.LimitTaskParam;
+import com.binarywang.wxjava.store.bean.product.GiftActivityAddResponse;
+import com.binarywang.wxjava.store.bean.product.GiftActivityInfo;
+import com.binarywang.wxjava.store.bean.product.GiftProductAddResponse;
+import com.binarywang.wxjava.store.bean.product.GiftProductGetResponse;
+import com.binarywang.wxjava.store.bean.product.GiftProductInfo;
+import com.binarywang.wxjava.store.bean.product.GiftProductListParam;
+import com.binarywang.wxjava.store.bean.product.GiftProductListResponse;
+import com.binarywang.wxjava.store.bean.product.AddProductThirdPartySourceParam;
+import com.binarywang.wxjava.store.bean.product.AddProductThirdPartySourceResponse;
+import com.binarywang.wxjava.store.bean.product.ExternalProductMappingNewParam;
+import com.binarywang.wxjava.store.bean.product.ExternalProductMappingNewResponse;
+import com.binarywang.wxjava.store.bean.product.ExternalProductMappingParam;
+import com.binarywang.wxjava.store.bean.product.ExternalProductMappingResponse;
+import com.binarywang.wxjava.store.bean.product.ProductAuditQuotaResponse;
+import com.binarywang.wxjava.store.bean.product.ProductAuditStrategyResponse;
+import com.binarywang.wxjava.store.bean.product.ProductAuditStrategySetParam;
+import com.binarywang.wxjava.store.bean.product.ProductBrandRecommendParam;
+import com.binarywang.wxjava.store.bean.product.ProductBrandRecommendResponse;
+import com.binarywang.wxjava.store.bean.product.ProductCategoryClassifyParam;
+import com.binarywang.wxjava.store.bean.product.ProductCategoryClassifyResponse;
+import com.binarywang.wxjava.store.bean.product.ProductCategoryPreCheckParam;
+import com.binarywang.wxjava.store.bean.product.ProductCategoryPreCheckResponse;
+import com.binarywang.wxjava.store.bean.product.ProductSchemeParam;
+import com.binarywang.wxjava.store.bean.product.ProductSchemeResponse;
+import com.binarywang.wxjava.store.bean.product.ProductStockFlowParam;
+import com.binarywang.wxjava.store.bean.product.ProductStockFlowResponse;
+import com.binarywang.wxjava.store.bean.product.ProductTimingSaleParam;
+import com.binarywang.wxjava.store.bean.product.SkuStockBatchResponse;
+import com.binarywang.wxjava.store.bean.product.SkuStockResponse;
+import com.binarywang.wxjava.store.bean.product.SpuFastInfo;
+import com.binarywang.wxjava.store.bean.product.SpuGetResponse;
+import com.binarywang.wxjava.store.bean.product.SpuInfo;
+import com.binarywang.wxjava.store.bean.product.SpuListResponse;
+import com.binarywang.wxjava.store.bean.product.SpuUpdateInfo;
+import com.binarywang.wxjava.store.bean.product.SpuUpdateResponse;
+import com.binarywang.wxjava.store.bean.product.link.ProductH5UrlResponse;
+import com.binarywang.wxjava.store.bean.product.link.ProductQrCodeResponse;
+import com.binarywang.wxjava.store.bean.product.link.ProductTagLinkResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 商品服务接口
+ *
+ * @author Zeyes
+ * @see 商品状态流转图
+ */
+public interface WxStoreProductService {
+
+ /**
+ * 添加商品
+ *
+ * @param info 商品信息
+ * @return 返回商品的状态和id
+ *
+ * @throws WxErrorException 异常
+ */
+ SpuUpdateResponse addProduct(SpuUpdateInfo info) throws WxErrorException;
+
+ /**
+ * 更新商品
+ *
+ * @param info 商品信息
+ * @return 返回商品的状态和id
+ *
+ * @throws WxErrorException 异常
+ */
+ SpuUpdateResponse updateProduct(SpuUpdateInfo info) throws WxErrorException;
+
+ /**
+ * 添加商品
+ *
+ * @param info 商品信息
+ * @return 返回商品的状态和id
+ *
+ * @throws WxErrorException 异常
+ * @deprecated 请使用 {@link #addProduct(SpuUpdateInfo)}
+ */
+ @Deprecated
+ SpuUpdateResponse addProduct(SpuInfo info) throws WxErrorException;
+
+ /**
+ * 更新商品
+ *
+ * @param info 商品信息
+ * @return 返回商品的状态和id
+ *
+ * @throws WxErrorException 异常
+ * @deprecated 请使用 {@link #updateProduct(SpuUpdateInfo)}
+ */
+ @Deprecated
+ SpuUpdateResponse updateProduct(SpuInfo info) throws WxErrorException;
+
+ /**
+ * 免审更新商品
+ *
+ * @param info 商品信息
+ * @return 返回商品的状态和id
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateProductAuditFree(SpuFastInfo info) throws WxErrorException;
+
+ /**
+ * 更新商品库存 （仅对edit_status != 2 的商品适用，其他状态的商品无法通过该接口修改库存）
+ *
+ * @param productId 内部商品ID
+ * @param skuId 内部sku_id
+ * @param diffType 修改类型 1增加 2减少 3设置
+ * 建议使用1或2，不建议使用3，因为使用3在高并发场景可能会出现预期外表现
+ * @param num 增加、减少或者设置的库存值
+ * @return WxStoreBaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateStock(String productId, String skuId, Integer diffType, Integer num)
+ throws WxErrorException;
+
+ /**
+ * 删除商品
+ *
+ * @param productId 商品ID
+ * @return 是否成功
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse deleteProduct(String productId) throws WxErrorException;
+
+ /**
+ * 撤回商品审核
+ *
+ * @param productId 商品ID
+ * @return 是否成功
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse cancelProductAudit(String productId) throws WxErrorException;
+
+ /**
+ * 获取商品
+ *
+ * @param productId 商品ID
+ * @param dataType 默认取1 1:获取线上数据 2:获取草稿数据 3:同时获取线上和草稿数据（注意：需成功上架后才有线上数据）
+ * @return 商品信息
+ *
+ * @throws WxErrorException 异常
+ */
+ SpuGetResponse getProduct(String productId, Integer dataType) throws WxErrorException;
+
+ /**
+ * 获取商品列表
+ *
+ * @param pageSize 每页数量（默认10，不超过30）
+ * @param nextKey 由上次请求返回，记录翻页的上下文。传入时会从上次返回的结果往后翻一页，不传默认拉取第一页数据。
+ * @param status 商品状态，不填默认拉全部商品（不包含回收站） {@link com.binarywang.wxjava.store.enums.SpuStatus}
+ * @return List
+ *
+ * @throws WxErrorException 异常
+ */
+ SpuListResponse listProduct(Integer pageSize, String nextKey, Integer status) throws WxErrorException;
+
+ /**
+ * 上架商品
+ *
+ * @param productId 商品ID
+ * @return 是否成功
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse upProduct(String productId) throws WxErrorException;
+
+ /**
+ * 下架商品
+ *
+ * @param productId 商品ID
+ * @return 是否成功
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse downProduct(String productId) throws WxErrorException;
+
+ /**
+ * 获取商品实时库存
+ *
+ * @param productId 商品ID
+ * @param skuId skuId
+ * @return SkuStockResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ SkuStockResponse getSkuStock(String productId, String skuId) throws WxErrorException;
+
+ /**
+ * 批量获取库存信息 （单次请求不能超过50个商品ID）
+ *
+ * @param productIds 商品ID列表
+ * @return 库存信息
+ * @throws WxErrorException 异常
+ */
+ SkuStockBatchResponse getSkuStockBatch(List productIds) throws WxErrorException;
+
+ /**
+ * 获取商品H5链接
+ *
+ * @param productId 商品ID
+ * @return 商品H5链接
+ * @throws WxErrorException 异常
+ */
+ ProductH5UrlResponse getProductH5Url(String productId) throws WxErrorException;
+
+ /**
+ * 获取商品二维码
+ *
+ * @param productId 商品ID
+ * @return 商品二维码
+ * @throws WxErrorException 异常
+ */
+ ProductQrCodeResponse getProductQrCode(String productId) throws WxErrorException;
+
+ /**
+ * 获取商品口令
+ *
+ * @param productId 商品ID
+ * @return 商品口令
+ * @throws WxErrorException 异常
+ */
+ ProductTagLinkResponse getProductTagLink(String productId) throws WxErrorException;
+
+ /**
+ * 获取商品的移动应用跳转 scheme 码.
+ *
+ * @param param 商品 ID、来源 appid、过期时间和附加信息
+ * @return 商品跳转 scheme 码
+ * @throws WxErrorException 调用微信接口失败
+ */
+ ProductSchemeResponse getProductScheme(ProductSchemeParam param) throws WxErrorException;
+
+ /**
+ * 商品类目推荐.
+ *
+ * @param param 请求类型、商品标题、主图和可选类目 ID；当请求类型为 2 时必须提供类目 ID
+ * @return 推荐类目及店铺经营权限
+ * @throws WxErrorException 调用微信接口失败
+ */
+ ProductCategoryClassifyResponse classifyProductCategory(ProductCategoryClassifyParam param) throws WxErrorException;
+
+ /**
+ * 将定时开售商品改为立即开售.
+ *
+ * @param param 商品 ID 和定时开售任务 ID
+ * @return 操作结果
+ * @throws WxErrorException 调用微信接口失败
+ */
+ WxStoreBaseResponse beginTimingSale(ProductTimingSaleParam param) throws WxErrorException;
+
+ /**
+ * 取消商品开售.
+ *
+ * @param productId 商品 ID
+ * @return 操作结果
+ * @throws WxErrorException 调用微信接口失败
+ */
+ WxStoreBaseResponse cancelTimingSale(String productId) throws WxErrorException;
+
+ /**
+ * 查询站内外商品属性映射.
+ *
+ * @param param 叶子类目 ID、外部类目和外部属性
+ * @return 对应的站内属性及可选属性值
+ * @throws WxErrorException 调用微信接口失败
+ */
+ ExternalProductMappingResponse externalProductMapping(ExternalProductMappingParam param) throws WxErrorException;
+
+ /**
+ * 发品前校验店铺类目资质.
+ *
+ * @param param 待发布商品的叶子类目 ID
+ * @return 校验结果和未通过原因
+ * @throws WxErrorException 调用微信接口失败
+ */
+ ProductCategoryPreCheckResponse categoryPreCheck(ProductCategoryPreCheckParam param) throws WxErrorException;
+
+ /**
+ * 获取店铺维度的商品上架策略.
+ *
+ * @return 当前上架策略
+ * @throws WxErrorException 调用微信接口失败
+ */
+ ProductAuditStrategyResponse getProductAuditStrategy() throws WxErrorException;
+
+ /**
+ * 设置店铺维度的商品上架策略.
+ *
+ * @param param 要设置的上架策略
+ * @return 操作结果
+ * @throws WxErrorException 调用微信接口失败
+ */
+ WxStoreBaseResponse setProductAuditStrategy(ProductAuditStrategySetParam param) throws WxErrorException;
+
+ /**
+ * 获取当前店铺的商品提审限额.
+ *
+ * @return 提审总额度和新品剩余额度
+ * @throws WxErrorException 调用微信接口失败
+ */
+ ProductAuditQuotaResponse getProductAuditQuota() throws WxErrorException;
+
+ /**
+ * 商品属性映射及推荐.
+ *
+ * @param param 叶子类目、商品标题、主图及可选的外部属性
+ * @return 推荐的站内属性
+ * @throws WxErrorException 调用微信接口失败
+ */
+ ExternalProductMappingNewResponse externalProductMappingNew(ExternalProductMappingNewParam param)
+ throws WxErrorException;
+
+ /**
+ * 根据商品信息推荐店铺已有资质的品牌.
+ *
+ * @param param 商品叶子类目、标题和图片
+ * @return 推荐品牌
+ * @throws WxErrorException 调用微信接口失败
+ */
+ ProductBrandRecommendResponse productBrandRecommend(ProductBrandRecommendParam param) throws WxErrorException;
+
+ /**
+ * 新增第三方货源信息.
+ *
+ * @param param 场景、发布方式、货主及货源商品信息
+ * @return 包含第三方货源 ID 的操作结果
+ * @throws WxErrorException 调用微信接口失败
+ */
+ AddProductThirdPartySourceResponse addProductThirdPartySource(AddProductThirdPartySourceParam param)
+ throws WxErrorException;
+
+ /**
+ * 获取商品库存流水.
+ *
+ * @param param 商品、SKU、库存类型、时间范围和分页参数；pageSize 必填，stockType 为 1 时 finderId 必填，库存类型非 0 和 1 时 stockTypeId 必填
+ * @return 库存流水及下一页标识
+ * @throws WxErrorException 调用微信接口失败
+ */
+ ProductStockFlowResponse getStockFlow(ProductStockFlowParam param) throws WxErrorException;
+
+ /**
+ * 添加非卖商品
+ *
+ * @param info 赠品信息
+ * @return 添加赠品响应
+ * @throws WxErrorException 异常
+ */
+ GiftProductAddResponse addGiftProduct(GiftProductInfo info) throws WxErrorException;
+
+ /**
+ * 更新非卖商品
+ *
+ * @param info 赠品信息
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateGiftProduct(GiftProductInfo info) throws WxErrorException;
+
+ /**
+ * 在售商品转赠品
+ *
+ * @param productId 商品ID
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse setProductAsGift(String productId) throws WxErrorException;
+
+ /**
+ * 获取赠品
+ *
+ * @param productId 赠品商品ID
+ * @return 赠品详情响应
+ * @throws WxErrorException 异常
+ */
+ GiftProductGetResponse getGiftProduct(String productId) throws WxErrorException;
+
+ /**
+ * 获取赠品列表
+ *
+ * @param param 查询参数
+ * @return 赠品列表
+ * @throws WxErrorException 异常
+ */
+ GiftProductListResponse listGiftProduct(GiftProductListParam param) throws WxErrorException;
+
+ /**
+ * 更新赠品库存
+ *
+ * @param productId 赠品商品ID
+ * @param skuId 赠品sku_id
+ * @param diffType 修改类型 1增加 2减少 3设置
+ * 建议使用1或2，不建议使用3，因为使用3在高并发场景可能会出现预期外表现
+ * @param num 增加、减少或者设置的库存值
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateGiftStock(String productId, String skuId, Integer diffType, Integer num)
+ throws WxErrorException;
+
+ /**
+ * 创建赠品活动
+ *
+ * @param info 活动信息
+ * @return 创建赠品活动响应
+ * @throws WxErrorException 异常
+ */
+ GiftActivityAddResponse addGiftActivity(GiftActivityInfo info) throws WxErrorException;
+
+ /**
+ * 删除赠品活动
+ *
+ * @param activityId 活动ID
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse deleteGiftActivity(String activityId) throws WxErrorException;
+
+ /**
+ * 停止赠品活动
+ *
+ * @param activityId 活动ID
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse stopGiftActivity(String activityId) throws WxErrorException;
+
+ /**
+ * 添加限时抢购任务
+ *
+ * @param param 限时抢购任务
+ * @return LimitTaskAddResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ LimitTaskAddResponse addLimitTask(LimitTaskParam param) throws WxErrorException;
+
+ /**
+ * 拉取限时抢购任务列表
+ *
+ * @param pageSize 每页数量(默认10，不超过50)
+ * @param nextKey 由上次请求返回，记录翻页的上下文。传入时会从上次返回的结果往后翻一页，不传默认拉取第一页数据
+ * @param status 抢购活动状态
+ * @return LimitTaskListResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ LimitTaskListResponse listLimitTask(Integer pageSize, String nextKey, Integer status) throws WxErrorException;
+
+ /**
+ * 停止限时抢购任务
+ *
+ * @param taskId 限时抢购任务ID
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse stopLimitTask(String taskId) throws WxErrorException;
+
+ /**
+ * 停止限时抢购任务
+ *
+ * @param taskId 限时抢购任务ID
+ * @return BaseResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse deleteLimitTask(String taskId) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreProductStockService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreProductStockService.java
new file mode 100644
index 0000000000..12a3911cad
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreProductStockService.java
@@ -0,0 +1,56 @@
+package com.binarywang.wxjava.store.api;
+
+import java.util.List;
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.product.SkuStockBatchResponse;
+import com.binarywang.wxjava.store.bean.product.SkuStockResponse;
+import com.binarywang.wxjava.store.bean.product.stock.StockFlowParam;
+import com.binarywang.wxjava.store.bean.product.stock.StockFlowResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店商品库存服务。
+ */
+public interface WxStoreProductStockService {
+
+ /**
+ * 更新商品库存。
+ *
+ * @param productId 商品ID
+ * @param skuId 商品sku_id
+ * @param diffType 修改类型 1增加 2减少 3设置
+ * @param num 增加、减少或者设置的库存值
+ * @return 操作响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateStock(String productId, String skuId, Integer diffType, Integer num)
+ throws WxErrorException;
+
+ /**
+ * 获取商品实时库存。
+ *
+ * @param productId 商品ID
+ * @param skuId 商品sku_id
+ * @return 库存响应
+ * @throws WxErrorException 异常
+ */
+ SkuStockResponse getSkuStock(String productId, String skuId) throws WxErrorException;
+
+ /**
+ * 批量获取库存信息。
+ *
+ * @param productIds 商品ID列表，单次请求不超过50个
+ * @return 库存信息
+ * @throws WxErrorException 异常
+ */
+ SkuStockBatchResponse getSkuStockBatch(List productIds) throws WxErrorException;
+
+ /**
+ * 获取商品库存流水。
+ *
+ * @param param 库存流水查询参数
+ * @return 库存流水响应
+ * @throws WxErrorException 异常
+ */
+ StockFlowResponse getStockFlow(StockFlowParam param) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreQicService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreQicService.java
new file mode 100644
index 0000000000..819d0488b8
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreQicService.java
@@ -0,0 +1,67 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.qic.InspectCodeResponse;
+import com.binarywang.wxjava.store.bean.qic.InspectConfigResponse;
+import com.binarywang.wxjava.store.bean.qic.RegisterLogisticsRequest;
+import com.binarywang.wxjava.store.bean.qic.SubmitConfigResponse;
+import com.binarywang.wxjava.store.bean.qic.SubmitInspectRequest;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 质检管理接口.
+ */
+public interface WxStoreQicService {
+
+ /**
+ * 查询质检仓配置.
+ *
+ * @return 质检仓配置
+ * @throws WxErrorException 异常
+ */
+ InspectConfigResponse getInspectConfig() throws WxErrorException;
+
+ /**
+ * 查询送检配置模板信息.
+ *
+ * @param orderId 订单号（可选）
+ * @return 送检配置模板信息
+ * @throws WxErrorException 异常
+ */
+ SubmitConfigResponse getSubmitConfig(String orderId) throws WxErrorException;
+
+ /**
+ * 查询送检配置模板信息.
+ *
+ * @return 送检配置模板信息
+ * @throws WxErrorException 异常
+ */
+ SubmitConfigResponse getSubmitConfig() throws WxErrorException;
+
+ /**
+ * 打印质检码.
+ *
+ * @param orderId 订单号
+ * @return 质检码详情
+ * @throws WxErrorException 异常
+ */
+ InspectCodeResponse printInspectCode(String orderId) throws WxErrorException;
+
+ /**
+ * 绑定送检信息.
+ *
+ * @param request 送检信息请求
+ * @return 基础响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse submitInspectInfo(SubmitInspectRequest request) throws WxErrorException;
+
+ /**
+ * 自寄快递送检.
+ *
+ * @param request 自寄快递请求
+ * @return 基础响应
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse registerLogistics(RegisterLogisticsRequest request) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreService.java
new file mode 100644
index 0000000000..7b88a9f6b6
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreService.java
@@ -0,0 +1,204 @@
+package com.binarywang.wxjava.store.api;
+
+/**
+ * The interface Wx Store service
+ *
+ * @author Zeyes
+ */
+public interface WxStoreService extends BaseWxStoreService {
+
+ /**
+ * 商家客服服务。
+ *
+ * @return 商家客服服务
+ */
+ default WxStoreKfService getKfService() {
+ throw new UnsupportedOperationException("WxStoreService implementation does not support getKfService()");
+ }
+
+ /**
+ * 基础接口服务
+ *
+ * @return 基础接口服务
+ */
+ WxStoreBasicService getBasicService();
+
+ /**
+ * 商品类目服务
+ *
+ * @return 商品类目服务
+ */
+ WxStoreCategoryService getCategoryService();
+
+ /**
+ * 品牌服务
+ *
+ * @return 品牌服务
+ */
+ WxStoreBrandService getBrandService();
+
+ /**
+ * 商品服务
+ *
+ * @return 商品服务
+ */
+ WxStoreProductService getProductService();
+
+ /**
+ * 赠品与买赠活动服务
+ *
+ * @return 赠品与买赠活动服务
+ */
+ default WxStoreGiftService getGiftService() {
+ throw new UnsupportedOperationException("Gift service is not supported by this implementation");
+ }
+
+ /**
+ * 限时抢购服务
+ *
+ * @return 限时抢购服务
+ */
+ default WxStoreLimitedDiscountService getLimitedDiscountService() {
+ throw new UnsupportedOperationException("Limited discount service is not supported by this implementation");
+ }
+
+ /**
+ * 商品库存服务
+ *
+ * @return 商品库存服务
+ */
+ default WxStoreProductStockService getProductStockService() {
+ throw new UnsupportedOperationException("Product stock service is not supported by this implementation");
+ }
+
+ /**
+ * 商品辅助功能服务
+ *
+ * @return 商品辅助功能服务
+ */
+ default WxStoreProductAssistantService getProductAssistantService() {
+ throw new UnsupportedOperationException("Product assistant service is not supported by this implementation");
+ }
+
+ /**
+ * 仓库服务
+ *
+ * @return 仓库服务
+ */
+ WxStoreWarehouseService getWarehouseService();
+
+ /**
+ * 订单服务
+ *
+ * @return 订单服务
+ */
+ WxStoreOrderService getOrderService();
+
+ /**
+ * 售后服务
+ *
+ * @return 售后服务
+ */
+ WxStoreAfterSaleService getAfterSaleService();
+
+ /**
+ * 运费模板服务
+ *
+ * @return 运费模板服务
+ */
+ WxStoreFreightTemplateService getFreightTemplateService();
+
+ /**
+ * 地址服务
+ *
+ * @return 地址服务
+ */
+ WxStoreAddressService getAddressService();
+
+ /**
+ * 优惠券服务
+ *
+ * @return 优惠券服务
+ */
+ WxStoreCouponService getCouponService();
+
+ /**
+ * 分享员服务
+ *
+ * @return 分享员服务
+ */
+ WxStoreSharerService getSharerService();
+
+ /**
+ * 资金服务
+ *
+ * @return 资金服务
+ */
+ WxStoreFundService getFundService();
+
+ /**
+ * 主页管理服务
+ *
+ * @return 主页管理服务
+ */
+ WxStoreHomePageService getHomePageService();
+
+ /**
+ * 合作账号服务
+ *
+ * @return 团长合作服务
+ */
+ WxStoreCooperationService getCooperationService();
+
+ /**
+ * 微信小店 罗盘商家版服务
+ *
+ * @return 罗盘商家版服务
+ */
+ WxStoreCompassShopService getCompassShopService();
+
+ /**
+ * 代发管理服务
+ *
+ * @return 代发管理服务
+ */
+ WxStoreSupplierService getSupplierService();
+
+ /**
+ * 会员功能
+ *
+ * @return 会员服务
+ */
+ WxStoreVipService getVipService();
+
+ /**
+ * 质检管理服务.
+ *
+ * @return 质检管理服务
+ */
+ WxStoreQicService getQicService();
+
+ /**
+ * 微信小店-带货助手服务
+ *
+ * @return 带货助手服务
+ */
+ WxTalentService getTalentService();
+
+ /**
+ * 收藏管理服务
+ *
+ * @return 收藏管理服务
+ */
+ WxStoreFavoriteService getFavoriteService();
+
+ /**
+ * 电子面单服务
+ *
+ * @return 电子面单服务
+ */
+ default WxStoreEwaybillService getEwaybillService() {
+ throw new UnsupportedOperationException("当前 WxStoreService 实现不支持电子面单服务");
+ }
+
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreSharerService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreSharerService.java
new file mode 100644
index 0000000000..a85c19b397
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreSharerService.java
@@ -0,0 +1,71 @@
+package com.binarywang.wxjava.store.api;
+
+import java.util.List;
+import com.binarywang.wxjava.store.bean.sharer.SharerBindResponse;
+import com.binarywang.wxjava.store.bean.sharer.SharerInfoResponse;
+import com.binarywang.wxjava.store.bean.sharer.SharerOrderParam;
+import com.binarywang.wxjava.store.bean.sharer.SharerOrderResponse;
+import com.binarywang.wxjava.store.bean.sharer.SharerSearchResponse;
+import com.binarywang.wxjava.store.bean.sharer.SharerUnbindResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 分享员服务接口
+ *
+ * @author Zeyes
+ */
+public interface WxStoreSharerService {
+
+ /**
+ * 邀请分享员
+ *
+ * @param username 邀请的用户微信号
+ * @return SharerBindResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ SharerBindResponse bindSharer(String username) throws WxErrorException;
+
+ /**
+ * 获取绑定的分享员
+ *
+ * @param openid 分享员openid
+ * @param username 分享员微信号（二选一）
+ * @return SharerSearchResponse
+ *
+ * @throws WxErrorException 异常
+ */
+ SharerSearchResponse searchSharer(String openid, String username) throws WxErrorException;
+
+ /**
+ * 获取绑定的分享员列表
+ *
+ * @param page 分页参数，页数
+ * @param pageSize 分页参数，每页分享员数（不超过100
+ * @param sharerType 分享员类型
+ * @return 分享员列表
+ *
+ * @throws WxErrorException 异常
+ */
+ SharerInfoResponse listSharer(Integer page, Integer pageSize, Integer sharerType) throws WxErrorException;
+
+ /**
+ * 获取分享员订单列表
+ *
+ * @param param 参数
+ * @return 列表
+ *
+ * @throws WxErrorException 异常
+ */
+ SharerOrderResponse listSharerOrder(SharerOrderParam param) throws WxErrorException;
+
+ /**
+ * 解绑分享员
+ *
+ * @param openIds openid列表
+ * @return 状态
+ *
+ * @throws WxErrorException 异常
+ */
+ SharerUnbindResponse unbindSharer(List openIds) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreSupplierService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreSupplierService.java
new file mode 100644
index 0000000000..ba37c6042d
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreSupplierService.java
@@ -0,0 +1,70 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.supplier.DistributeTypeResponse;
+import com.binarywang.wxjava.store.bean.supplier.DropshipAssignRequest;
+import com.binarywang.wxjava.store.bean.supplier.DropshipDetailResponse;
+import com.binarywang.wxjava.store.bean.supplier.DropshipListRequest;
+import com.binarywang.wxjava.store.bean.supplier.DropshipListResponse;
+import com.binarywang.wxjava.store.bean.supplier.DropshipResponse;
+import com.binarywang.wxjava.store.bean.supplier.DropshipSearchRequest;
+import com.binarywang.wxjava.store.bean.supplier.ProductDistributeRequest;
+import com.binarywang.wxjava.store.bean.supplier.ProductListResponse;
+import com.binarywang.wxjava.store.bean.supplier.SupplierInfoResponse;
+import com.binarywang.wxjava.store.bean.supplier.SupplierListResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店代发管理服务。
+ *
+ * @author GitHub Copilot
+ * @see 代发管理接口文档
+ */
+public interface WxStoreSupplierService {
+
+ /** 获取供货商列表。 */
+ SupplierListResponse getSupplierList() throws WxErrorException;
+
+ /**
+ * 获取供货商列表。
+ *
+ * @param pageSize 每页数量
+ * @param nextKey 由上次请求返回，记录翻页的上下文。传入时会从上次返回的结果往后翻一页
+ * @return 供货商列表响应
+ * @throws WxErrorException 异常
+ */
+ SupplierListResponse getSupplierList(Integer pageSize, String nextKey) throws WxErrorException;
+
+ /** 获取分配方式。 */
+ DistributeTypeResponse getDistribute() throws WxErrorException;
+
+ /** 设置全店订单手动分配。 */
+ WxStoreBaseResponse setManuallyDistribute() throws WxErrorException;
+
+ /** 设置全店订单自动分配。 */
+ WxStoreBaseResponse setAllDistribute(String supplierId) throws WxErrorException;
+
+ /** 设置按商品自动分配。 */
+ WxStoreBaseResponse setProductDistribute(ProductDistributeRequest req) throws WxErrorException;
+
+ /** 获取商品对应的自动分配供货商。 */
+ SupplierInfoResponse getProductDefaultDistribute(String productId) throws WxErrorException;
+
+ /** 获取按商品自动分配的商品列表。 */
+ ProductListResponse getProductList(String supplierId) throws WxErrorException;
+
+ /** 分配订单代发。 */
+ DropshipResponse assignOrder(DropshipAssignRequest req) throws WxErrorException;
+
+ /** 取消分配代发单。 */
+ WxStoreBaseResponse cancelDropship(String orderId) throws WxErrorException;
+
+ /** 查询代发单详情。 */
+ DropshipDetailResponse getDropship(String orderId) throws WxErrorException;
+
+ /** 拉取代发单列表。 */
+ DropshipListResponse listDropship(DropshipListRequest req) throws WxErrorException;
+
+ /** 搜索代发单。 */
+ DropshipListResponse searchDropship(DropshipSearchRequest req) throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreVipService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreVipService.java
new file mode 100644
index 0000000000..fbd231c401
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreVipService.java
@@ -0,0 +1,97 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.vip.VipInfoResponse;
+import com.binarywang.wxjava.store.bean.vip.VipListResponse;
+import com.binarywang.wxjava.store.bean.vip.VipScoreResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店 会员功能接口
+ *
+ * @author aushiye
+ * @link 会员功能接口文档
+ */
+public interface WxStoreVipService {
+ /** 拉取用户详情 */
+ // String VIP_USER_INFO_URL = "https://api.weixin.qq.com/channels/ec/vip/user/info/get";
+ // /** 拉取用户列表 */
+ // String VIP_USER_LIST_URL = "https://api.weixin.qq.com/channels/ec/vip/user/list/get";
+ //
+ // /** 获取用户积分 */
+ // String VIP_SCORE_URL = "https://api.weixin.qq.com/channels/ec/vip/user/score/get";
+ // /** 增加用户积分 */
+ // String SCORE_INCREASE_URL = "https://api.weixin.qq.com/channels/ec/vip/user/score/increase";
+ // /** 减少用户积分 */
+ // String SCORE_DECREASE_URL = "https://api.weixin.qq.com/channels/ec/vip/user/score/decrease";
+ //
+ // /** 更新用户等级 */
+ // String GRADE_UPDATE_URL = "https://api.weixin.qq.com/channels/ec/vip/user/grade/update";
+
+
+ /**
+ * 获取用户详情
+ *
+ * @param openId the open id
+ * @param needPhoneNumber the need phone number
+ * @return the vip info
+ * @throws WxErrorException the wx error exception
+ */
+ VipInfoResponse getVipInfo(String openId, Boolean needPhoneNumber) throws WxErrorException;
+
+
+ /**
+ * 获取用户积分
+ *
+ * @param needPhoneNumber the need phone number
+ * @param pageNum the page num
+ * @param pageSize the page size
+ * @return the vip list
+ * @throws WxErrorException the wx error exception
+ */
+ VipListResponse getVipList(Boolean needPhoneNumber, Integer pageNum, Integer pageSize) throws WxErrorException;
+
+ /**
+ * 获取用户积分
+ *
+ * @param openId the open id
+ * @return the vip score
+ * @throws WxErrorException the wx error exception
+ */
+ VipScoreResponse getVipScore(String openId) throws WxErrorException;
+
+ /**
+ * 增加用户积分
+ *
+ * @param openId the open id
+ * @param score the score
+ * @param remark the remark
+ * @param requestId the request id
+ * @return the wx channel base response
+ * @throws WxErrorException the wx error exception
+ */
+ WxStoreBaseResponse increaseVipScore(String openId, String score, String remark, String requestId) throws WxErrorException;
+
+ /**
+ * 减少用户积分
+ *
+ * @param openId the open id
+ * @param score the score
+ * @param remark the remark
+ * @param requestId the request id
+ * @return the wx channel base response
+ * @throws WxErrorException the wx error exception
+ */
+ WxStoreBaseResponse decreaseVipScore(String openId, String score, String remark, String requestId) throws WxErrorException;
+
+ /**
+ * 更新用户等级
+ *
+ * @param openId the open id
+ * @param score the score
+ * @return the wx channel base response
+ * @throws WxErrorException the wx error exception
+ */
+ WxStoreBaseResponse updateVipGrade(String openId, Integer score) throws WxErrorException;
+
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreWarehouseService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreWarehouseService.java
new file mode 100644
index 0000000000..85892b81af
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxStoreWarehouseService.java
@@ -0,0 +1,137 @@
+package com.binarywang.wxjava.store.api;
+
+
+import java.util.List;
+import com.binarywang.wxjava.store.bean.base.WxStoreBaseResponse;
+import com.binarywang.wxjava.store.bean.warehouse.LocationPriorityResponse;
+import com.binarywang.wxjava.store.bean.warehouse.PriorityLocationParam;
+import com.binarywang.wxjava.store.bean.warehouse.WarehouseIdsResponse;
+import com.binarywang.wxjava.store.bean.warehouse.WarehouseLocation;
+import com.binarywang.wxjava.store.bean.warehouse.WarehouseParam;
+import com.binarywang.wxjava.store.bean.warehouse.WarehouseResponse;
+import com.binarywang.wxjava.store.bean.warehouse.WarehouseStockParam;
+import com.binarywang.wxjava.store.bean.warehouse.WarehouseStockResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+
+/**
+ * 微信小店 区域仓库服务
+ *
+ * @author Zeyes
+ */
+public interface WxStoreWarehouseService {
+
+ /**
+ * 创建仓库
+ *
+ * @param param 仓库信息
+ * @return 响应
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse createWarehouse(WarehouseParam param) throws WxErrorException;
+
+ /**
+ * 查询仓库列表
+ *
+ * @param pageSize 每页数量（最大不超过10）
+ * @param nextKey 由上次请求返回，记录翻页的上下文。传入时会从上次返回的结果往后翻一页，不传默认拉取第一页数据
+ * @return 响应
+ *
+ * @throws WxErrorException 异常
+ */
+ WarehouseIdsResponse listWarehouse(Integer pageSize, String nextKey) throws WxErrorException;
+
+ /**
+ * 获取仓库详情
+ *
+ * @param outWarehouseId 外部仓库ID
+ * @return 响应
+ *
+ * @throws WxErrorException 异常
+ */
+ WarehouseResponse getWarehouse(String outWarehouseId) throws WxErrorException;
+
+ /**
+ * 修改仓库详情
+ *
+ * @param outWarehouseId 外部仓库ID
+ * @param name 仓库名称
+ * @param intro 仓库介绍
+ * @return 响应
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateWarehouse(String outWarehouseId, String name, String intro) throws WxErrorException;
+
+ /**
+ * 批量增加覆盖区域
+ *
+ * @param outWarehouseId 外部仓库ID
+ * @param coverLocations 覆盖区域
+ * @return 响应
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse addWarehouseArea(String outWarehouseId, List coverLocations)
+ throws WxErrorException;
+
+ /**
+ * 批量删除覆盖区域
+ *
+ * @param outWarehouseId 外部仓库ID
+ * @param coverLocations 覆盖区域
+ * @return 响应
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse deleteWarehouseArea(String outWarehouseId, List coverLocations)
+ throws WxErrorException;
+
+ /**
+ * 设置指定地址下的仓的优先级
+ *
+ * @param param 参数
+ * @return 响应
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse setWarehousePriority(PriorityLocationParam param) throws WxErrorException;
+
+ /**
+ * 获取指定地址下的仓的优先级
+ *
+ * @param addressId1 省份地址编码
+ * @param addressId2 市地址编码
+ * @param addressId3 区地址编码
+ * @param addressId4 街道地址编码
+ * @return 仓的优先级
+ *
+ * @throws WxErrorException 异常
+ */
+ LocationPriorityResponse getWarehousePriority(Integer addressId1, Integer addressId2, Integer addressId3,
+ Integer addressId4) throws WxErrorException;
+
+ /**
+ * 更新区域仓库存数量
+ *
+ * @param param 参数
+ * @return 响应
+ *
+ * @throws WxErrorException 异常
+ */
+ WxStoreBaseResponse updateWarehouseStock(WarehouseStockParam param) throws WxErrorException;
+
+ /**
+ * 获取区域仓库存数量
+ *
+ * @param productId 商品ID
+ * @param outWarehouseId 外部仓库ID
+ * @param skuId 商品skuId
+ * @return 响应
+ *
+ * @throws WxErrorException 异常
+ */
+ WarehouseStockResponse getWarehouseStock(String productId, String skuId, String outWarehouseId)
+ throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxTalentService.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxTalentService.java
new file mode 100644
index 0000000000..b947e0b53e
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/WxTalentService.java
@@ -0,0 +1,56 @@
+package com.binarywang.wxjava.store.api;
+
+import com.binarywang.wxjava.store.bean.talent.TalentOrderDetailParam;
+import com.binarywang.wxjava.store.bean.talent.TalentOrderDetailResponse;
+import com.binarywang.wxjava.store.bean.talent.TalentOrderListParam;
+import com.binarywang.wxjava.store.bean.talent.TalentOrderListResponse;
+import com.binarywang.wxjava.store.bean.talent.TalentWindowProductDetailParam;
+import com.binarywang.wxjava.store.bean.talent.TalentWindowProductDetailResponse;
+import com.binarywang.wxjava.store.bean.talent.TalentWindowProductListParam;
+import com.binarywang.wxjava.store.bean.talent.TalentWindowProductListResponse;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信小店-带货助手服务接口
+ *
+ * @author GitHub Copilot
+ */
+public interface WxTalentService {
+
+ /**
+ * 获取佣金单列表
+ *
+ * @param param 查询参数
+ * @return 佣金单列表
+ * @throws WxErrorException 接口调用异常
+ */
+ TalentOrderListResponse getOrderList(TalentOrderListParam param) throws WxErrorException;
+
+ /**
+ * 获取佣金单详情
+ *
+ * @param param 查询参数
+ * @return 佣金单详情
+ * @throws WxErrorException 接口调用异常
+ */
+ TalentOrderDetailResponse getOrderDetail(TalentOrderDetailParam param) throws WxErrorException;
+
+ /**
+ * 获取达人橱窗商品列表
+ *
+ * @param param 查询参数
+ * @return 橱窗商品列表
+ * @throws WxErrorException 接口调用异常
+ */
+ TalentWindowProductListResponse getWindowProductList(TalentWindowProductListParam param) throws WxErrorException;
+
+ /**
+ * 获取达人橱窗商品详情
+ *
+ * @param param 查询参数
+ * @return 橱窗商品详情
+ * @throws WxErrorException 接口调用异常
+ */
+ TalentWindowProductDetailResponse getWindowProductDetail(TalentWindowProductDetailParam param)
+ throws WxErrorException;
+}
diff --git a/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/impl/BaseWxStoreMessageServiceImpl.java b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/impl/BaseWxStoreMessageServiceImpl.java
new file mode 100644
index 0000000000..1369a383e9
--- /dev/null
+++ b/weixin-java-store/src/main/java/com/binarywang/wxjava/store/api/impl/BaseWxStoreMessageServiceImpl.java
@@ -0,0 +1,418 @@
+package com.binarywang.wxjava.store.api.impl;
+
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import com.binarywang.wxjava.store.api.BaseWxStoreMessageService;
+import com.binarywang.wxjava.store.api.WxStoreService;
+import com.binarywang.wxjava.store.bean.message.after.AfterSaleMessage;
+import com.binarywang.wxjava.store.bean.message.after.ComplaintMessage;
+import com.binarywang.wxjava.store.bean.message.coupon.CouponActionMessage;
+import com.binarywang.wxjava.store.bean.message.coupon.CouponReceiveMessage;
+import com.binarywang.wxjava.store.bean.message.coupon.UserCouponExpireMessage;
+import com.binarywang.wxjava.store.bean.message.fund.AccountNotifyMessage;
+import com.binarywang.wxjava.store.bean.message.fund.QrNotifyMessage;
+import com.binarywang.wxjava.store.bean.message.fund.WithdrawNotifyMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderCancelMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderConfirmMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderDeliveryMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderExtMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderIdMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderPayMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderSettleMessage;
+import com.binarywang.wxjava.store.bean.message.order.OrderStatusMessage;
+import com.binarywang.wxjava.store.bean.message.product.BrandMessage;
+import com.binarywang.wxjava.store.bean.message.product.CategoryAuditMessage;
+import com.binarywang.wxjava.store.bean.message.product.SpuAuditMessage;
+import com.binarywang.wxjava.store.bean.message.product.SpuStockMessage;
+import com.binarywang.wxjava.store.bean.message.sharer.SharerChangeMessage;
+import com.binarywang.wxjava.store.bean.message.store.CloseStoreMessage;
+import com.binarywang.wxjava.store.bean.message.store.NicknameUpdateMessage;
+import com.binarywang.wxjava.store.bean.message.supplier.SupplierItemMessage;
+import com.binarywang.wxjava.store.bean.message.vip.ExchangeInfoMessage;
+import com.binarywang.wxjava.store.bean.message.vip.UserInfoMessage;
+import com.binarywang.wxjava.store.bean.message.voucher.VoucherMessage;
+import com.binarywang.wxjava.store.message.WxStoreMessage;
+import com.binarywang.wxjava.store.message.WxStoreMessageRouter;
+import com.binarywang.wxjava.store.message.WxStoreMessageRouterRule;
+import com.binarywang.wxjava.store.message.rule.HandlerConsumer;
+import me.chanjar.weixin.common.session.WxSessionManager;
+
+import static com.binarywang.wxjava.store.constant.MessageEventConstants.*;
+
+/**
+ * @author Zeyes
+ */
+@Slf4j
+public abstract class BaseWxStoreMessageServiceImpl implements BaseWxStoreMessageService {
+
+ /** 消息路由器 */
+ protected WxStoreMessageRouter router;
+
+ public BaseWxStoreMessageServiceImpl(WxStoreMessageRouter router) {
+ this.router = router;
+ this.addDefaultRule();
+ }
+
+ /**
+ * 添加默认的回调规则
+ */
+ protected void addDefaultRule() {
+ /* 品牌资质事件回调 */
+ this.addRule(BrandMessage.class, BRAND, this::brandUpdate);
+ /* 商品审核结果 */
+ this.addRule(SpuAuditMessage.class, PRODUCT_SPU_AUDIT, this::spuAudit);
+ /* 商品上下架 */
+ this.addRule(SpuAuditMessage.class, PRODUCT_SPU_STATUS_UPDATE, this::spuStatusUpdate);
+ /* 商品更新 */
+ this.addRule(SpuAuditMessage.class, PRODUCT_SPU_UPDATE, this::spuUpdate);
+ /* 商品库存不足 */
+ this.addRule(SpuStockMessage.class, PRODUCT_STOCK_NO_ENOUGH, this::stockNoEnough);
+ /* 类目审核结果 */
+ this.addRule(CategoryAuditMessage.class, PRODUCT_CATEGORY_AUDIT, this::categoryAudit);
+ /* 订单下单 */
+ this.addRule(OrderIdMessage.class, ORDER_NEW, this::orderNew);
+ /* 订单取消 */
+ this.addRule(OrderCancelMessage.class, ORDER_CANCEL, this::orderCancel);
+ /* 订单支付成功 */
+ this.addRule(OrderPayMessage.class, ORDER_PAY, this::orderPay);
+ /* 订单待发货 */
+ this.addRule(OrderIdMessage.class, ORDER_WAIT_SHIPPING, this::orderWaitShipping);
+ /* 订单发货 */
+ this.addRule(OrderDeliveryMessage.class, ORDER_DELIVER, this::orderDelivery);
+ /* 订单确认收货 */
+ this.addRule(OrderConfirmMessage.class, ORDER_CONFIRM, this::orderConfirm);
+ /* 订单结算成功 */
+ this.addRule(OrderSettleMessage.class, ORDER_SETTLE, this::orderSettle);
+ /* 订单其他信息更新 */
+ this.addRule(OrderExtMessage.class, ORDER_EXT_INFO_UPDATE, this::orderExtInfoUpdate);
+ /* 订单状态更新 */
+ this.addRule(OrderStatusMessage.class, ORDER_STATUS_UPDATE, this::orderStatusUpdate);
+ /* 售后单更新通知 */
+ this.addRule(AfterSaleMessage.class, AFTER_SALE_UPDATE, this::afterSaleStatusUpdate);
+ /* 纠纷更新通知 */
+ this.addRule(ComplaintMessage.class, COMPLAINT_NOTIFY, this::complaintNotify);
+ /* 优惠券领取通知 */
+ this.addRule(CouponReceiveMessage.class, RECEIVE_COUPON, this::couponReceive);
+ /* 优惠券使用通知 */
+ this.addRule(CouponActionMessage.class, CREATE_COUPON, this::couponCreate);
+ /* 优惠券删除通知 */
+ this.addRule(CouponActionMessage.class, DELETE_COUPON, this::couponDelete);
+ /* 优惠券过期通知 */
+ this.addRule(CouponActionMessage.class, EXPIRE_COUPON, this::couponExpire);
+ /* 更新优惠券信息通知 */
+ this.addRule(CouponActionMessage.class, UPDATE_COUPON_INFO, this::couponUpdate);
+ /* 更新优惠券信息通知 */
+ this.addRule(CouponActionMessage.class, INVALID_COUPON, this::couponInvalid);
+ /* 用户优惠券过期通知 */
+ this.addRule(UserCouponExpireMessage.class, USER_COUPON_EXPIRE, this::userCouponExpire);
+ /* 用户优惠券过期通知 */
+ this.addRule(UserCouponExpireMessage.class, USER_COUPON_UNUSE, this::userCouponUnuse);
+ /* 优惠券返还通知 */
+ this.addRule(UserCouponExpireMessage.class, USER_COUPON_USE, this::userCouponUse);
+ /* 发放团购优惠成功通知 */
+ this.addRule(VoucherMessage.class, VOUCHER_SEND_SUCC, this::voucherSendSucc);
+ /* 结算账户变更回调 */
+ this.addRule(AccountNotifyMessage.class, ACCOUNT_NOTIFY, this::accountNotify);
+ /* 提现回调 */
+ this.addRule(WithdrawNotifyMessage.class, WITHDRAW_NOTIFY, this::withdrawNotify);
+ /* 提现二维码回调 */
+ this.addRule(QrNotifyMessage.class, QRCODE_STATUS, this::qrNotify);
+ /* 团长 */
+ this.addRule(SupplierItemMessage.class, SUPPLIER_ITEM_UPDATE, this::supplierItemUpdate);
+
+ /* 用户加入会员 */
+ this.addRule(UserInfoMessage.class, USER_VIP_JOIN, false, this::vipJoin);
+ /* 用户注销会员 */
+ this.addRule(UserInfoMessage.class, USER_VIP_CLOSE,false, this::vipClose);
+ /* 用户等级信息更新 */
+ this.addRule(UserInfoMessage.class, USER_VIP_GRADE_INFO_UPDATE, false, this::vipGradeUpdate);
+ /* 用户积分更新 */
+ this.addRule(UserInfoMessage.class, USER_VIP_SCORE_UPDATE, false, this::vipScoreUpdate);
+ /* 用户积分兑换 */
+ this.addRule(ExchangeInfoMessage.class, USER_VIP_SCORE_EXCHANGE, false, this::vipScoreExchange);
+
+ /* 分享员变更 */
+ this.addRule(SharerChangeMessage.class,SHARER_CHANGE,false,this::sharerChange);
+
+ /* 小店注销 */
+ this.addRule(CloseStoreMessage.class, CLOSE_STORE, this::closeStore);
+ /* 小店修改名称 */
+ this.addRule(NicknameUpdateMessage.class, SET_SHOP_NICKNAME, this::updateNickname);
+ }
+
+ /**
+ * 添加一条规则进入路由器
+ *
+ * @param clazz 消息类型
+ * @param event 事件类型
+ * @param consumer 处理器
+ * @param 消息类型
+ */
+ protected void addRule(Class clazz, String event, Boolean async,
+ HandlerConsumer, WxSessionManager> consumer) {
+ WxStoreMessageRouterRule rule = new WxStoreMessageRouterRule<>();
+ rule.setMessageClass(clazz).setEvent(event).setAsync(async);
+ rule.getHandlers().add((message, content, appId, context, sessionManager) -> {
+ consumer.accept(message, content, appId, context, sessionManager);
+ return "success";
+ });
+ rule.setNext(true);
+ this.addRule(rule);
+ }
+
+ protected void addRule(Class clazz, String event,
+ HandlerConsumer, WxSessionManager> consumer) {
+ this.addRule(clazz, event, true, consumer);
+ }
+
+ @Override
+ public void addRule(WxStoreMessageRouterRule rule) {
+ router.getRules().add(rule);
+ }
+
+ @Override
+ public Object route(WxStoreMessage message, String content, String appId, final WxStoreService service) {
+ return router.route(message, content, appId, service);
+ }
+
+
+ @Override
+ public void orderNew(OrderIdMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("订单下单, event={}", message.getEvent());
+ }
+
+ @Override
+ public void orderCancel(OrderCancelMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("订单取消, event={}", message.getEvent());
+ }
+
+ @Override
+ public void orderPay(OrderPayMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("订单支付成功, event={}", message.getEvent());
+ }
+
+ @Override
+ public void orderWaitShipping(OrderIdMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("订单待发货, event={}", message.getEvent());
+ }
+
+ @Override
+ public void orderDelivery(OrderDeliveryMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("订单发货, event={}", message.getEvent());
+ }
+
+ @Override
+ public void orderConfirm(OrderConfirmMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("订单确认收货, event={}", message.getEvent());
+ }
+
+ @Override
+ public void orderSettle(OrderSettleMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("订单结算, event={}", message.getEvent());
+ }
+
+ @Override
+ public void orderExtInfoUpdate(OrderExtMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("订单其他信息更新, event={}", message.getEvent());
+ }
+
+ @Override
+ public void orderStatusUpdate(OrderStatusMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("订单状态更新, event={}", message.getEvent());
+ }
+
+ @Override
+ public void spuAudit(SpuAuditMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("商品审核, event={}", message.getEvent());
+ }
+
+ @Override
+ public void spuStatusUpdate(SpuAuditMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("商品状态更新, event={}", message.getEvent());
+ }
+
+ @Override
+ public void spuUpdate(SpuAuditMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("商品更新, event={}", message.getEvent());
+ }
+
+ @Override
+ public void stockNoEnough(SpuStockMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("商品库存不足, event={}", message.getEvent());
+ }
+
+ @Override
+ public void categoryAudit(CategoryAuditMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("分类审核, event={}", message.getEvent());
+ }
+
+ @Override
+ public void brandUpdate(BrandMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("品牌更新, event={}", message.getEvent());
+ }
+
+ @Override
+ public void afterSaleStatusUpdate(AfterSaleMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("售后状态更新, event={}", message.getEvent());
+ }
+
+ @Override
+ public void complaintNotify(ComplaintMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("投诉通知, event={}", message.getEvent());
+ }
+
+ @Override
+ public void couponReceive(CouponReceiveMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("优惠券领取, event={}", message.getEvent());
+ }
+
+ @Override
+ public void couponCreate(CouponActionMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("优惠券创建, event={}", message.getEvent());
+ }
+
+ @Override
+ public void couponDelete(CouponActionMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("优惠券删除, event={}", message.getEvent());
+ }
+
+ @Override
+ public void couponExpire(CouponActionMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("优惠券过期, event={}", message.getEvent());
+ }
+
+ @Override
+ public void couponUpdate(CouponActionMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("优惠券更新, event={}", message.getEvent());
+ }
+
+ @Override
+ public void couponInvalid(CouponActionMessage message, String content, String appId,
+ Map context, WxSessionManager sessionManager) {
+ log.info("优惠券失效, event={}", message.getEvent());
+ }
+
+ @Override
+ public void userCouponExpire(UserCouponExpireMessage message, String content, String appId,
+ Map