🎨 #1384 小程序体验者接口增加错误码，同时优化WxOpenStorageAutoConfiguration，增加keyPrefix属性

* ✨ 增加自助核销接口 * 🐛 修改接口路径 * ✨ 增加错误码 * ✨ 优化 * ✨ starter config增加keyPrefix * ✨ 修改支付返回结果判断
Wechat-Group · Jan 19, 2020 · 6b3a09a · 6b3a09a
1 parent ac935c5
commit 6b3a09a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/...java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java b/...java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java
@@ -49,19 +49,19 @@ public WxOpenConfigStorage wxOpenConfigStorage() {
       return getWxOpenInRedisConfigStorage();
     }
 
-    if (type == WxOpenProperties.StorageType.jedis){
+    if (type == WxOpenProperties.StorageType.jedis) {
       return getWxOpenInRedisConfigStorage();
     }
 
-    if (type == WxOpenProperties.StorageType.redisson){
+    if (type == WxOpenProperties.StorageType.redisson) {
       return getWxOpenInRedissonConfigStorage();
     }
     return getWxOpenInMemoryConfigStorage();
   }
 
   private WxOpenInMemoryConfigStorage getWxOpenInMemoryConfigStorage() {
     WxOpenInMemoryConfigStorage config = new WxOpenInMemoryConfigStorage();
-    config.setWxOpenInfo(properties.getAppId(),properties.getSecret(), properties.getToken(), properties.getAesKey());
+    config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
     return config;
   }
 
@@ -70,18 +70,18 @@ private WxOpenInRedisConfigStorage getWxOpenInRedisConfigStorage() {
     if (jedisPool == null || StringUtils.isNotEmpty(redisHost)) {
       poolToUse = getJedisPool();
     }
-    WxOpenInRedisConfigStorage config = new WxOpenInRedisConfigStorage(poolToUse);
-    config.setWxOpenInfo(properties.getAppId(),properties.getSecret(), properties.getToken(), properties.getAesKey());
+    WxOpenInRedisConfigStorage config = new WxOpenInRedisConfigStorage(poolToUse, properties.getConfigStorage().getKeyPrefix());
+    config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
     return config;
   }
 
-  private WxOpenInRedissonConfigStorage getWxOpenInRedissonConfigStorage(){
+  private WxOpenInRedissonConfigStorage getWxOpenInRedissonConfigStorage() {
     RedissonClient redissonClientToUse = this.redissonClient;
-    if(redissonClient == null){
+    if (redissonClient == null) {
       redissonClientToUse = getRedissonClient();
     }
-    WxOpenInRedissonConfigStorage config = new WxOpenInRedissonConfigStorage(redissonClientToUse);
-    config.setWxOpenInfo(properties.getAppId(),properties.getSecret(), properties.getToken(), properties.getAesKey());
+    WxOpenInRedissonConfigStorage config = new WxOpenInRedissonConfigStorage(redissonClientToUse, properties.getConfigStorage().getKeyPrefix());
+    config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
     return config;
   }
 
@@ -111,7 +111,7 @@ private JedisPool getJedisPool() {
     return pool;
   }
 
-  private RedissonClient getRedissonClient(){
+  private RedissonClient getRedissonClient() {
     WxOpenProperties.ConfigStorage storage = properties.getConfigStorage();
     RedisProperties redis = storage.getRedis();
 

diff --git a/.../src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java b/.../src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java
@@ -53,6 +53,8 @@ public static class ConfigStorage implements Serializable {
 
     private RedisProperties redis = new RedisProperties();
 
+    private String keyPrefix;
+
   }
 
   public enum StorageType {

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxMaErrorMsgEnum.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxMaErrorMsgEnum.java
@@ -452,6 +452,17 @@ public enum WxMaErrorMsgEnum {
   CODE_43101(43101, "用户拒绝接受消息，如果用户之前曾经订阅过，则表示用户取消了订阅关系"),
 
   CODE_47003(47003, "模板参数不准确，可能为空或者不满足规则，errmsg会提示具体是哪个字段出错"),
+
+  /**
+   * 小程序绑定体验者
+   */
+  CODE_85001(85001, "微信号不存在或微信号设置为不可搜索"),
+
+  CODE_85002(85002, "小程序绑定的体验者数量达到上限"),
+
+  CODE_85003(85003, "微信号绑定的小程序体验者达到上限"),
+
+  CODE_85004(85004, "微信号已经绑定"),
   ;
 
   private int code;