diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/BaseWxChannelMessageService.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/BaseWxChannelMessageService.java index 211024d33a535b435a826320411a02d8eba142b4..5a1ecce5819d86caa6430453757df7b4c29219cf 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/BaseWxChannelMessageService.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/BaseWxChannelMessageService.java @@ -21,6 +21,8 @@ import me.chanjar.weixin.channel.bean.message.product.BrandMessage; import me.chanjar.weixin.channel.bean.message.product.CategoryAuditMessage; import me.chanjar.weixin.channel.bean.message.product.SpuAuditMessage; import me.chanjar.weixin.channel.bean.message.supplier.SupplierItemMessage; +import me.chanjar.weixin.channel.bean.message.vip.ExchangeInfoMessage; +import me.chanjar.weixin.channel.bean.message.vip.UserInfoMessage; import me.chanjar.weixin.channel.message.WxChannelMessage; import me.chanjar.weixin.channel.message.WxChannelMessageRouterRule; import me.chanjar.weixin.common.session.WxSessionManager; @@ -357,6 +359,68 @@ public interface BaseWxChannelMessageService { 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); + + /** * 默认消息处理 * diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelService.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelService.java index 0bf1ede705c6d863d91ee78eb8b18d8e2e654faf..9d10f51c06b169ea076e41131032c9f6a9a4a224 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelService.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelService.java @@ -140,4 +140,11 @@ public interface WxChannelService extends BaseWxChannelService { */ WxAssistantService getAssistantService(); + + /** + * 会员功能 + * + * @return 会员服务 + */ + WxChannelVipService getVipService(); } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelVipService.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelVipService.java new file mode 100644 index 0000000000000000000000000000000000000000..0909844f0615c12e6751aa171239f31e2740702b --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelVipService.java @@ -0,0 +1,97 @@ +package me.chanjar.weixin.channel.api; + +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; +import me.chanjar.weixin.channel.bean.vip.VipInfoResponse; +import me.chanjar.weixin.channel.bean.vip.VipListResponse; +import me.chanjar.weixin.channel.bean.vip.VipScoreResponse; +import me.chanjar.weixin.common.error.WxErrorException; + +/** + * 视频号小店 会员功能接口 + * + * @author aushiye + * @link 会员功能接口文档 + */ +public interface WxChannelVipService { + /** 拉取用户详情 */ + // 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 + */ + WxChannelBaseResponse 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 + */ + WxChannelBaseResponse 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 + */ + WxChannelBaseResponse updateVipGrade(String openId, Integer score) throws WxErrorException; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelMessageServiceImpl.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelMessageServiceImpl.java index 008da958a9d794b8cdcd45bf922722dfa59159b2..2cc75d0de1d78a0cea54a14ac0e409d07c5398ec 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelMessageServiceImpl.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelMessageServiceImpl.java @@ -1,34 +1,5 @@ package me.chanjar.weixin.channel.api.impl; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.ACCOUNT_NOTIFY; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.AFTER_SALE_UPDATE; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.BRAND; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.COMPLAINT_NOTIFY; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.CREATE_COUPON; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.DELETE_COUPON; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.EXPIRE_COUPON; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.INVALID_COUPON; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.ORDER_CANCEL; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.ORDER_CONFIRM; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.ORDER_DELIVER; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.ORDER_EXT_INFO_UPDATE; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.ORDER_NEW; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.ORDER_PAY; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.ORDER_SETTLE; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.ORDER_STATUS_UPDATE; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.PRODUCT_CATEGORY_AUDIT; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.PRODUCT_SPU_AUDIT; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.PRODUCT_SPU_STATUS_UPDATE; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.PRODUCT_SPU_UPDATE; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.QRCODE_STATUS; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.RECEIVE_COUPON; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.SUPPLIER_ITEM_UPDATE; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.UPDATE_COUPON_INFO; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.USER_COUPON_EXPIRE; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.USER_COUPON_UNUSE; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.USER_COUPON_USE; -import static me.chanjar.weixin.channel.constant.MessageEventConstants.WITHDRAW_NOTIFY; - import java.util.Map; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.channel.api.BaseWxChannelMessageService; @@ -53,6 +24,8 @@ import me.chanjar.weixin.channel.bean.message.product.BrandMessage; import me.chanjar.weixin.channel.bean.message.product.CategoryAuditMessage; import me.chanjar.weixin.channel.bean.message.product.SpuAuditMessage; import me.chanjar.weixin.channel.bean.message.supplier.SupplierItemMessage; +import me.chanjar.weixin.channel.bean.message.vip.ExchangeInfoMessage; +import me.chanjar.weixin.channel.bean.message.vip.UserInfoMessage; import me.chanjar.weixin.channel.message.WxChannelMessage; import me.chanjar.weixin.channel.message.WxChannelMessageRouter; import me.chanjar.weixin.channel.message.WxChannelMessageRouterRule; @@ -60,11 +33,13 @@ import me.chanjar.weixin.channel.message.rule.HandlerConsumer; import me.chanjar.weixin.channel.util.JsonUtils; import me.chanjar.weixin.common.session.WxSessionManager; +import static me.chanjar.weixin.channel.constant.MessageEventConstants.*; + /** * @author Zeyes */ @Slf4j -public class BaseWxChannelMessageServiceImpl implements BaseWxChannelMessageService { +public abstract class BaseWxChannelMessageServiceImpl implements BaseWxChannelMessageService { /** 消息路由器 */ protected WxChannelMessageRouter router; @@ -134,6 +109,18 @@ public class BaseWxChannelMessageServiceImpl implements BaseWxChannelMessageServ 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); } /** @@ -144,10 +131,10 @@ public class BaseWxChannelMessageServiceImpl implements BaseWxChannelMessageServ * @param consumer 处理器 * @param 消息类型 */ - protected void addRule(Class clazz, String event, - HandlerConsumer, WxSessionManager> consumer) { + protected void addRule(Class clazz, String event, Boolean async, + HandlerConsumer, WxSessionManager> consumer) { WxChannelMessageRouterRule rule = new WxChannelMessageRouterRule<>(); - rule.setMessageClass(clazz).setEvent(event).setAsync(true); + rule.setMessageClass(clazz).setEvent(event).setAsync(async); rule.getHandlers().add((message, content, appId, context, sessionManager) -> { consumer.accept(message, content, appId, context, sessionManager); return "success"; @@ -155,6 +142,11 @@ public class BaseWxChannelMessageServiceImpl implements BaseWxChannelMessageServ this.addRule(rule); } + protected void addRule(Class clazz, String event, + HandlerConsumer, WxSessionManager> consumer) { + this.addRule(clazz, event, true, consumer); + } + @Override public void addRule(WxChannelMessageRouterRule rule) { router.getRules().add(rule); @@ -340,4 +332,25 @@ public class BaseWxChannelMessageServiceImpl implements BaseWxChannelMessageServ log.info("默认消息处理:{}", JsonUtils.encode(message)); return null; } + + + @Override + public abstract void vipJoin(UserInfoMessage message, String content, String appId, + Map context, WxSessionManager sessionManager); + + @Override + public abstract void vipClose(UserInfoMessage message, String content, String appId, + Map context, WxSessionManager sessionManager); + + @Override + public abstract void vipGradeUpdate(UserInfoMessage message, String content, String appId, + Map context, WxSessionManager sessionManager); + + @Override + public abstract void vipScoreUpdate(UserInfoMessage message, String content, String appId, + Map context, WxSessionManager sessionManager); + + @Override + public abstract void vipScoreExchange(ExchangeInfoMessage message, String content, String appId, + Map context, WxSessionManager sessionManager); } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java index bbe3bffcd5b4ac49275811a6e77cae8d7a02b4aa..307a9e77d1d6b39d80d1563595b8f7341fa8194e 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java @@ -3,26 +3,7 @@ package me.chanjar.weixin.channel.api.impl; import com.google.gson.JsonObject; import lombok.extern.slf4j.Slf4j; -import me.chanjar.weixin.channel.api.WxAssistantService; -import me.chanjar.weixin.channel.api.WxChannelAddressService; -import me.chanjar.weixin.channel.api.WxChannelAfterSaleService; -import me.chanjar.weixin.channel.api.WxChannelBasicService; -import me.chanjar.weixin.channel.api.WxChannelBrandService; -import me.chanjar.weixin.channel.api.WxChannelCategoryService; -import me.chanjar.weixin.channel.api.WxChannelCouponService; -import me.chanjar.weixin.channel.api.WxChannelFreightTemplateService; -import me.chanjar.weixin.channel.api.WxChannelFundService; -import me.chanjar.weixin.channel.api.WxChannelOrderService; -import me.chanjar.weixin.channel.api.WxChannelProductService; -import me.chanjar.weixin.channel.api.WxChannelService; -import me.chanjar.weixin.channel.api.WxChannelSharerService; -import me.chanjar.weixin.channel.api.WxChannelWarehouseService; -import me.chanjar.weixin.channel.api.WxFinderLiveService; -import me.chanjar.weixin.channel.api.WxLeadComponentService; -import me.chanjar.weixin.channel.api.WxLeagueProductService; -import me.chanjar.weixin.channel.api.WxLeaguePromoterService; -import me.chanjar.weixin.channel.api.WxLeagueSupplierService; -import me.chanjar.weixin.channel.api.WxLeagueWindowService; +import me.chanjar.weixin.channel.api.*; import me.chanjar.weixin.channel.config.WxChannelConfig; import me.chanjar.weixin.channel.util.JsonUtils; import me.chanjar.weixin.common.api.WxConsts; @@ -73,6 +54,7 @@ public abstract class BaseWxChannelServiceImpl implements WxChannelService private WxLeadComponentService leadComponentService = null; private WxFinderLiveService finderLiveService = null; private WxAssistantService assistantService = null; + private WxChannelVipService vipService = new WxChannelVipServiceImpl(this); protected WxChannelConfig config; private int retrySleepMillis = 1000; @@ -115,7 +97,7 @@ public abstract class BaseWxChannelServiceImpl implements WxChannelService } while (!locked); String response = doGetAccessTokenRequest(); return extractAccessToken(response); - } catch (IOException | InterruptedException e) { + } catch (WxErrorException | InterruptedException e) { throw new WxRuntimeException(e); } finally { if (locked) { @@ -130,7 +112,7 @@ public abstract class BaseWxChannelServiceImpl implements WxChannelService * @return . * @throws IOException . */ - protected abstract String doGetAccessTokenRequest() throws IOException; + protected abstract String doGetAccessTokenRequest() throws WxErrorException; @Override public String get(String url, String queryParam) throws WxErrorException { @@ -425,4 +407,8 @@ public abstract class BaseWxChannelServiceImpl implements WxChannelService return assistantService; } + @Override + public WxChannelVipService getVipService() { + return vipService; + } } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceHttpClientImpl.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceHttpClientImpl.java index bbe886526947e56353744ba7c627ccdf3af2394b..e0cb7676190b66690818eea26e7c8adfc566f26d 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceHttpClientImpl.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelServiceHttpClientImpl.java @@ -1,19 +1,27 @@ package me.chanjar.weixin.channel.api.impl; import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.GET_ACCESS_TOKEN_URL; +import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.GET_STABLE_ACCESS_TOKEN_URL; import java.io.IOException; import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.channel.api.WxChannelVipService; +import me.chanjar.weixin.channel.bean.token.StableToken; import me.chanjar.weixin.channel.config.WxChannelConfig; +import me.chanjar.weixin.channel.util.JsonUtils; +import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.util.http.HttpType; import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder; import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder; import org.apache.commons.lang3.StringUtils; +import org.apache.http.Consts; import org.apache.http.HttpHost; import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.BasicResponseHandler; import org.apache.http.impl.client.CloseableHttpClient; @@ -25,9 +33,18 @@ public class WxChannelServiceHttpClientImpl extends BaseWxChannelServiceImpl { + private OkHttpClient httpClient; + private OkHttpProxyInfo httpProxy; + private Boolean stabled = false; + private Boolean forceRefresh = false; + protected final Object globalAccessTokenRefreshLock = new Object(); + + /** + * 设置调用接口参数. + * + * @param stabled false 表示调用AccessToken接口， true调用稳定版接口 + * @param forceRefresh stabled=true使用， true表示强制刷新模式 + */ + public WxChannelServiceOkHttpImpl(Boolean stabled, Boolean forceRefresh) { + this.stabled = stabled; + this.forceRefresh = forceRefresh; + } + + @Override + public void initHttp() { + log.debug("WxChannelServiceOkHttpImpl initHttp"); + if (this.config.getHttpProxyHost() != null && this.config.getHttpProxyPort() > 0) { + this.httpProxy = OkHttpProxyInfo.httpProxy(this.config.getHttpProxyHost(), this.config.getHttpProxyPort(), this.config.getHttpProxyUsername(), this.config.getHttpProxyPassword()); + okhttp3.OkHttpClient.Builder clientBuilder = new okhttp3.OkHttpClient.Builder(); + clientBuilder.proxy(this.getRequestHttpProxy().getProxy()); + clientBuilder.authenticator(new Authenticator() { + @Override + public Request authenticate(Route route, Response response) throws IOException { + String credential = Credentials.basic(WxChannelServiceOkHttpImpl.this.httpProxy.getProxyUsername(), WxChannelServiceOkHttpImpl.this.httpProxy.getProxyPassword()); + return response.request().newBuilder().header("Authorization", credential).build(); + } + }); + this.httpClient = clientBuilder.build(); + } else { + this.httpClient = DefaultOkHttpClientBuilder.get().build(); + } + } + + @Override + public OkHttpClient getRequestHttpClient() { + return this.httpClient; + } + + @Override + public OkHttpProxyInfo getRequestHttpProxy() { + return this.httpProxy; + } + + @Override + public HttpType getRequestType() { + return HttpType.OK_HTTP; + } + + @Override + protected String doGetAccessTokenRequest() throws WxErrorException { + if (stabled) { + return internalGetStableAccessToken(this.forceRefresh); + } else{ + return internalGetAccessToken(forceRefresh); + } + } + + public String internalGetStableAccessToken(boolean forceRefresh) throws WxErrorException { + if (!this.config.isAccessTokenExpired() && !forceRefresh) { + return this.config.getAccessToken(); + } else { + synchronized(this.globalAccessTokenRefreshLock) { + OkHttpClient client = this.getRequestHttpClient(); + + String url = String.format(GET_STABLE_ACCESS_TOKEN_URL, config.getAppid(), config.getSecret()); + + StableToken stableToken = new StableToken("client_credential", config.getAppid(),config.getSecret(), forceRefresh); + + RequestBody body = RequestBody.Companion.create(JsonUtils.encode(stableToken), MediaType.parse("application/json; charset=utf-8")); + + Request request = (new Request.Builder()).url(url).post(body).build(); + String resultContent = null; + try { + Response response = client.newCall(request).execute(); + resultContent = response.body().string(); + } catch (IOException var9) { + log.error(var9.getMessage(), var9); + } + + WxError error = WxError.fromJson(resultContent, WxType.CP); + if (error.getErrorCode() != 0) { + throw new WxErrorException(error); + } + + WxAccessToken accessToken = WxAccessToken.fromJson(resultContent); + this.config.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn()); + } + return this.config.getAccessToken(); + } + } + + public String internalGetAccessToken(boolean forceRefresh) throws WxErrorException { + if (!this.config.isAccessTokenExpired() && !forceRefresh) { + return this.config.getAccessToken(); + } else { + synchronized(this.globalAccessTokenRefreshLock) { + OkHttpClient client = this.getRequestHttpClient(); + + String url = String.format(GET_ACCESS_TOKEN_URL, config.getAppid(), config.getSecret()); + + Request request = (new Request.Builder()).url(url).get().build(); + + String resultContent = null; + try { + Response response = client.newCall(request).execute(); + resultContent = response.body().string(); + } catch (IOException var9) { + log.error(var9.getMessage(), var9); + } + + WxError error = WxError.fromJson(resultContent, WxType.CP); + if (error.getErrorCode() != 0) { + throw new WxErrorException(error); + } + + WxAccessToken accessToken = WxAccessToken.fromJson(resultContent); + this.config.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn()); + } + return this.config.getAccessToken(); + } + } +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelVipServiceImpl.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelVipServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..1bad47593d705809cac4711bf909081f2d08d1e3 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelVipServiceImpl.java @@ -0,0 +1,68 @@ +package me.chanjar.weixin.channel.api.impl; + +import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.channel.api.WxChannelVipService; +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; +import me.chanjar.weixin.channel.bean.vip.*; +import me.chanjar.weixin.channel.util.ResponseUtils; +import me.chanjar.weixin.common.error.WxErrorException; + +import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Vip.*; + +/** + * 视频号小店 会员功能接口 + * + * @author aushiye + * @link 会员功能接口文档 + */ + +@Slf4j +public class WxChannelVipServiceImpl implements WxChannelVipService { + private BaseWxChannelServiceImpl vipHttpService; + + public WxChannelVipServiceImpl(BaseWxChannelServiceImpl vipHttpService) { + this.vipHttpService = vipHttpService; + } + + @Override + public VipInfoResponse getVipInfo(String openId, Boolean needPhoneNumber) throws WxErrorException { + VipInfoParam param = new VipInfoParam(openId, needPhoneNumber); + String respJson = vipHttpService.post(VIP_USER_INFO_URL, param); + return ResponseUtils.decode(respJson, VipInfoResponse.class); + } + + @Override + public VipListResponse getVipList(Boolean needPhoneNumber, Integer pageNum, Integer PageSize) throws WxErrorException { + VipListParam param = new VipListParam(needPhoneNumber, pageNum, PageSize); + String respJson = vipHttpService.post(VIP_USER_LIST_URL, param); + return ResponseUtils.decode(respJson, VipListResponse.class); + } + + @Override + public VipScoreResponse getVipScore(String openId) throws WxErrorException { + VipParam param = new VipParam(openId); + String respJson = vipHttpService.post(VIP_SCORE_URL, param); + return ResponseUtils.decode(respJson, VipScoreResponse.class); + } + + @Override + public WxChannelBaseResponse increaseVipScore(String openId, String score, String remark, String requestId) throws WxErrorException { + VipScoreParam param = new VipScoreParam(openId, score, remark, requestId); + String respJson = vipHttpService.post(SCORE_INCREASE_URL, param); + return ResponseUtils.decode(respJson, WxChannelBaseResponse.class); + } + + @Override + public WxChannelBaseResponse decreaseVipScore(String openId, String score, String remark, String requestId) throws WxErrorException { + VipScoreParam param = new VipScoreParam(openId, score, remark, requestId); + String respJson = vipHttpService.post(SCORE_DECREASE_URL, param); + return ResponseUtils.decode(respJson, WxChannelBaseResponse.class); + } + + @Override + public WxChannelBaseResponse updateVipGrade(String openId, Integer score) throws WxErrorException { + VipGradeParam param = new VipGradeParam(openId, score); + String respJson = vipHttpService.post(GRADE_UPDATE_URL, param); + return ResponseUtils.decode(respJson, WxChannelBaseResponse.class); + } +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/CouponInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/CouponInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..4305d4738dba4c5798ba6422c7efdd938cfd72e0 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/CouponInfo.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.channel.bean.message.vip; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 优惠券信息 + * + * @author asushiye + */ + +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +@NoArgsConstructor +public class CouponInfo implements Serializable { + + private static final long serialVersionUID = -3659710836197413932L; + /** 兑换的优惠券ID**/ + @JsonProperty("related_coupon_id") + @JacksonXmlProperty(localName = "related_coupon_id") + private Long relatedCouponId; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/ExchangeInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/ExchangeInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..4cec52af020b001f8c14181a2ee9ddc23acfb9a0 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/ExchangeInfo.java @@ -0,0 +1,42 @@ +package me.chanjar.weixin.channel.bean.message.vip; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 积分兑换 + * + * @author asushiye + */ + +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +@NoArgsConstructor +public class ExchangeInfo implements Serializable { + + private static final long serialVersionUID = -5692646625631036694L; + /** 入会时间 **/ + @JsonProperty("pay_score") + @JacksonXmlProperty(localName = "pay_score") + private Long pay_score; + + /** 兑换类型 1.优惠券 2商品 **/ + @JsonProperty("score_item_type") + @JacksonXmlProperty(localName = "score_item_type") + private Long score_item_type; + + /** 优惠券信息 **/ + @JsonProperty("coupon_info") + @JacksonXmlProperty(localName = "coupon_info") + private CouponInfo couponInfo; + + /** 商品信息 **/ + @JsonProperty("product_info") + @JacksonXmlProperty(localName = "product_info") + private ProductInfo productInfo; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/ExchangeInfoMessage.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/ExchangeInfoMessage.java new file mode 100644 index 0000000000000000000000000000000000000000..6cb98225bd446e63911b85837ca4c3f3413028c9 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/ExchangeInfoMessage.java @@ -0,0 +1,28 @@ +package me.chanjar.weixin.channel.bean.message.vip; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.message.WxChannelMessage; + +/** + * 积分兑换消息 + * + * @author asushiye + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JacksonXmlRootElement(localName = "xml") +public class ExchangeInfoMessage extends WxChannelMessage { + + private static final long serialVersionUID = 2926346100146724110L; + /** 积分兑换信息 */ + @JsonProperty("exchange_info") + @JacksonXmlProperty(localName = "exchange_info") + private ExchangeInfo exchangeInfo; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/ProductInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/ProductInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..451a1e19b5a22563a2cab01109c98d519765a9fe --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/ProductInfo.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.channel.bean.message.vip; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 商品信息 + * + * @author asushiye + */ + +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +@NoArgsConstructor +public class ProductInfo implements Serializable { + + private static final long serialVersionUID = -3037180342360944232L; + /** 兑换的商品ID**/ + @JsonProperty("related_product_id") + @JacksonXmlProperty(localName = "related_product_id") + private Long relatedProductId; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/UserInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/UserInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..f21c83c1685b9f9fc78bb059b3a76b382c197818 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/UserInfo.java @@ -0,0 +1,59 @@ +package me.chanjar.weixin.channel.bean.message.vip; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 用户信息 + * + * @author asushiye + */ + +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +@NoArgsConstructor +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 1239486732464880985L; + /** 入会时间 **/ + @JsonProperty("join_time") + @JacksonXmlProperty(localName = "join_time") + private Long joinTime; + + /** 注销时间 **/ + @JsonProperty("close_time") + @JacksonXmlProperty(localName = "close_time") + private Long closeTime; + + /** 手机号 **/ + @JsonProperty("phone_number") + @JacksonXmlProperty(localName = "phone_number") + private String phoneNumber; + + /** 等级 **/ + @JsonProperty("grade") + @JacksonXmlProperty(localName = "grade") + private Integer grade; + + /** 当前等级经验值 **/ + @JsonProperty("experience_value") + @JacksonXmlProperty(localName = "experience_value") + private Long experienceValue; + + /** 当前积分 **/ + @JsonProperty("score") + @JacksonXmlProperty(localName = "score") + private Long score; + + /** 本次改动积分,负数减少，正数新增 **/ + @JsonProperty("delta_score") + @JacksonXmlProperty(localName = "delta_score") + private Long deltaScore; + + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/UserInfoMessage.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/UserInfoMessage.java new file mode 100644 index 0000000000000000000000000000000000000000..439edd0951f16e7510afc5b5031bca72c3503cd0 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/message/vip/UserInfoMessage.java @@ -0,0 +1,28 @@ +package me.chanjar.weixin.channel.bean.message.vip; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.message.WxChannelMessage; + +/** + * 用户信息消息 + * + * @author asushiye + */ + +@Data +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@JacksonXmlRootElement(localName = "xml") +public class UserInfoMessage extends WxChannelMessage { + + private static final long serialVersionUID = 6926608689621530622L; + /** 用户信息 */ + @JsonProperty("user_info") + @JacksonXmlProperty(localName = "order_info") + private UserInfo userInfo; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/token/StableToken.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/token/StableToken.java new file mode 100644 index 0000000000000000000000000000000000000000..72ce83d077e05f634f7ba3ffc77e4fccbc53f9a3 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/token/StableToken.java @@ -0,0 +1,34 @@ +package me.chanjar.weixin.channel.bean.token; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 稳定版access_token,请求参数 + * + * @author asushiye + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class StableToken implements Serializable { + private static final long serialVersionUID = 6849364823232834171L; + + @JsonProperty("grant_type") + private String grantType; + + @JsonProperty("appid") + private String appId; + + @JsonProperty("secret") + private String secret; + + @JsonProperty("force_refresh") + private Boolean forceRefresh; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/ScoreInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/ScoreInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..ac2d2f9763bdc187a03a11ca16641a266bb94828 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/ScoreInfo.java @@ -0,0 +1,23 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 视频号小店-会员功能 - 订单详情 + * + * @author asushiye + * + */ +@Data +@NoArgsConstructor +public class ScoreInfo implements Serializable { + + private static final long serialVersionUID = -3290653233070826576L; + /** 积分 */ + @JsonProperty("score") + protected String score; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/UserGradeInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/UserGradeInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..b01577348021f34b336a8003d62e290642b93707 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/UserGradeInfo.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 视频号小店-会员功能 - 用户等级信息 + * + * @author asushiye + * + */ +@Data +@NoArgsConstructor +public class UserGradeInfo implements Serializable { + + private static final long serialVersionUID = -8040963202754069865L; + /** 等级编号 */ + @JsonProperty("grade") + protected Integer grade; + + /** 用户经验值 */ + @JsonProperty("experience_value") + protected String experienceValue; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/UserInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/UserInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..1104d532f1c4c436d0dd94d21f3f5f9320773cbd --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/UserInfo.java @@ -0,0 +1,23 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 视频号小店-会员功能 - 订单详情 + * + * @author asushiye + * + */ +@Data +@NoArgsConstructor +public class UserInfo implements Serializable { + + private static final long serialVersionUID = 8523354700203385190L; + /** 手机号 */ + @JsonProperty("phone_number") + protected String phoneNumber; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipGradeParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipGradeParam.java new file mode 100644 index 0000000000000000000000000000000000000000..5f5004f35ce5e22e214141a0ced9cdf38e6d8c5e --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipGradeParam.java @@ -0,0 +1,31 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author : zhenyun.su + * @since : 2023/10/8 + + */ + +@Data +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +@AllArgsConstructor +public class VipGradeParam implements Serializable { + + + private static final long serialVersionUID = 8672089025435220864L; + @JsonProperty("openid") + private String openId; + + @JsonProperty("grade") + private Integer grade; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..64eafbc3a4e6823816e780ef98af1a7038c15f46 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipInfo.java @@ -0,0 +1,47 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 视频号小店-会员功能 - 订单详情 + * + * @author asushiye + * + * "info": { + * "openid": "OPENID", + * "unionid": "UNIONID", + * "user_info": { + * "phone_number": "123456789" + * }, + * "user_grade_info": { + * "grade": 1, + * "experience_value": "100" + * } + * } + */ +@Data +@NoArgsConstructor +public class VipInfo implements Serializable { + private static final long serialVersionUID = -215590991862774701L; + + /** 视频号openid */ + @JsonProperty("openid") + protected String openId; + + /** 视频号union_id */ + @JsonProperty("union_id") + protected String unionId; + + /** 用户信息 */ + @JsonProperty("user_info") + protected UserInfo userInfo; + + /** 用户等级信息 */ + @JsonProperty("user_grade_info") + protected UserGradeInfo userGradeInfo; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipInfoParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipInfoParam.java new file mode 100644 index 0000000000000000000000000000000000000000..09c28f55106d22338750b433c8824a6203191a49 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipInfoParam.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author : zhenyun.su + * @since : 2023/10/8 + */ + +@Data +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +@AllArgsConstructor +public class VipInfoParam implements Serializable { + private static final long serialVersionUID = -4196252299609288196L; + @JsonProperty("openid") + private String openId; + + @JsonProperty("need_phone_number") + private Boolean needPhoneNumber; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipInfoResponse.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipInfoResponse.java new file mode 100644 index 0000000000000000000000000000000000000000..3411eef038b07ca8e4a1dc3d6cf425fbb65181e5 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipInfoResponse.java @@ -0,0 +1,20 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; + +/** + * @author : zhenyun.su + * @since : 2023/10/8 + */ + +@Data +@NoArgsConstructor +public class VipInfoResponse extends WxChannelBaseResponse { + + private static final long serialVersionUID = -2439510304690862381L; + @JsonProperty("info") + private VipInfo vipInfo; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipListParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipListParam.java new file mode 100644 index 0000000000000000000000000000000000000000..d23c41fcd5f7d40ca0b862cbf9da1915151c3b5d --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipListParam.java @@ -0,0 +1,32 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author : zhenyun.su + * @since : 2023/10/8 + */ + +@Data +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +@AllArgsConstructor +public class VipListParam implements Serializable { + + private static final long serialVersionUID = 7503422865410116202L; + @JsonProperty("need_phone_number") + private Boolean needPhoneNumber; + + @JsonProperty("page_num") + private Integer pageNum; + + @JsonProperty("page_size") + private Integer pageSize; + +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipListResponse.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipListResponse.java new file mode 100644 index 0000000000000000000000000000000000000000..0e213f8d195cb0cda9da924a9e76e2dfd3479260 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipListResponse.java @@ -0,0 +1,25 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; + +import java.util.List; + +/** + * @author : zhenyun.su + * @since : 2023/10/8 + */ + +@Data +@NoArgsConstructor +public class VipListResponse extends WxChannelBaseResponse { + + private static final long serialVersionUID = -8127372979925053579L; + @JsonProperty("list") + private List vipInfos; + + @JsonProperty("total_num") + private Long totalNum; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipParam.java new file mode 100644 index 0000000000000000000000000000000000000000..e439641ed9d4c0d52e2552a168f61158f344219c --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipParam.java @@ -0,0 +1,24 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author : zhenyun.su + * @since : 2023/10/8 + */ + +@Data +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +@AllArgsConstructor +public class VipParam implements Serializable { + private static final long serialVersionUID = -7924178026258012317L; + @JsonProperty("openid") + private String openId; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipScoreParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipScoreParam.java new file mode 100644 index 0000000000000000000000000000000000000000..51b679f39323add902034c531d64cf4b445d8a55 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipScoreParam.java @@ -0,0 +1,39 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author : zhenyun.su + * @since : 2023/10/8 + * { + * "openid": "OPENID", + * "score": "100", + * "remark": "备注", + * "request_id": "REQUEST_ID" + * } + */ + +@Data +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +@AllArgsConstructor +public class VipScoreParam implements Serializable { + private static final long serialVersionUID = -4122983978977407168L; + @JsonProperty("openid") + private String openId; + + @JsonProperty("score") + private String score; + + @JsonProperty("remark") + private String remark; + + @JsonProperty("request_id") + private String requestId; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipScoreResponse.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipScoreResponse.java new file mode 100644 index 0000000000000000000000000000000000000000..da356db74fde0d5f37ca5539df8ffd4582d4e42e --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/vip/VipScoreResponse.java @@ -0,0 +1,20 @@ +package me.chanjar.weixin.channel.bean.vip; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import me.chanjar.weixin.channel.bean.base.WxChannelBaseResponse; + +/** + * @author : zhenyun.su + * @since : 2023/10/8 + */ + +@Data +@NoArgsConstructor +public class VipScoreResponse extends WxChannelBaseResponse { + + private static final long serialVersionUID = -7252972818862693546L; + @JsonProperty("info") + private ScoreInfo scoreInfo; +} diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/MessageEventConstants.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/MessageEventConstants.java index e0e419efc63b87f138a35b8bff313b177953649c..f1e445513caeb082cade5cf89af5918f98238ff4 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/MessageEventConstants.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/MessageEventConstants.java @@ -67,4 +67,16 @@ public interface MessageEventConstants { // 其他 /** 进入会话事件 */ String USER_ENTER_TEMP_SESSION = "user_enter_tempsession"; + + // 会员相关 + /** 用户加入会员 */ + String USER_VIP_JOIN = "channels_ec_vip_join"; + /** 用户注销会员 */ + String USER_VIP_CLOSE = "channels_ec_vip_close"; + /** 用户等级更新 */ + String USER_VIP_GRADE_INFO_UPDATE = "channels_ec_vip_grade_info_update"; + /** 用户积分更新 */ + String USER_VIP_SCORE_UPDATE = "channels_ec_vip_score_update"; + /** 用户积分兑换 */ + String USER_VIP_SCORE_EXCHANGE = "channels_ec_vip_score_exchange"; } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/WxChannelApiUrlConstants.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/WxChannelApiUrlConstants.java index 644e34b22203bb7f4a13979bb79dc1b8264e4e03..4be90c370b1e0a4e5def0e41b8c5cc8e4ef0232b 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/WxChannelApiUrlConstants.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/constant/WxChannelApiUrlConstants.java @@ -16,6 +16,11 @@ public class WxChannelApiUrlConstants { public static final String GET_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"; + /** + * 获取Stable access_token. + */ + public static final String GET_STABLE_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/stable_token"; + /** 基础接口 */ public interface Basics { @@ -400,4 +405,23 @@ public class WxChannelApiUrlConstants { */ String GET_FINDER_LIVE_LEADS_DATA = "https://api.weixin.qq.com/channels/finderlive/get_finder_live_leads_data"; } + + + /** 会员功能接口 */ + public interface Vip { + /** 拉取用户详情 */ + 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"; + } } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java index ec031d3afe5afc776739642d875e3d70d68b0a39..2a41ea050895ca54813b127a25d9a11812a2d2eb 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java @@ -11,7 +11,7 @@ import okhttp3.Response; import java.io.IOException; /** - * . + * * * @author ecoolper * created on 2017/5/4