diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtAccessToken.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtAccessToken.java new file mode 100644 index 000000000..0b48250eb --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtAccessToken.java @@ -0,0 +1,13 @@ +package com.iformall.douyin.miniapp.api; + +import cn.binarywang.wx.miniapp.bean.AbstractWxMaQrcodeWrapper; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode(callSuper = false) +public class TtAccessToken extends AbstractWxMaQrcodeWrapper { + private String accessToken; +} diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java index d041f204d..f650ca37c 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/TtMaQrcode.java @@ -12,7 +12,7 @@ import java.io.Serializable; */ @Data @EqualsAndHashCode(callSuper = false) -public class TtMaQrcode extends AbstractWxMaQrcodeWrapper implements Serializable { +public class TtMaQrcode extends TtAccessToken implements Serializable { private static final long serialVersionUID = 5777119669111011584L; private String appname; private String path; diff --git a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java index a2fee9971..f67a673c0 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/miniapp/api/impl/TtMaServiceImpl.java @@ -32,6 +32,7 @@ import org.apache.http.impl.client.BasicResponseHandler; import org.apache.http.impl.client.CloseableHttpClient; import java.io.IOException; +import java.lang.reflect.Field; import java.util.HashMap; import java.util.Map; import java.util.concurrent.locks.Lock; @@ -218,26 +219,21 @@ public class TtMaServiceImpl implements TtMaService, RequestHttp aClass = data.getClass(); + if(!aClass.equals(String.class)){ + Field accessToken1 = aClass.getDeclaredField("accessToken"); + accessToken1.setAccessible(true); + accessToken1.set(data,accessToken); } - } catch (Exception e){ - log.error("\n【请求参数+access_token】:{}\n【错误信息】:{}", dataForLog, e.getMessage()); - } - if(param == null){ - param = data; + } catch (Exception e) { + log.error("【请求参数】:{}添加accessToken失败"); } -// String uriWithAccessToken = uri + (uri.contains("?") ? "&" : "?") + "access_token=" + accessToken; - String uriWithAccessToken = uri; + String uriWithAccessToken = uri + (uri.contains("?") ? "&" : "?") + "access_token=" + accessToken; try { - T result = executor.execute(uriWithAccessToken, param, WxType.MiniApp); + T result = executor.execute(uriWithAccessToken, data, WxType.MiniApp); log.debug("\n【请求地址】: {}\n【请求参数】:{}\n【响应数据】:{}", uriWithAccessToken, dataForLog, result); return result; } catch (WxErrorException e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index eac62a601..37e97fe16 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -6,10 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumBusiness; -import com.iformall.enums.EnumCUserBasicInfoStatus; -import com.iformall.enums.EnumScoreRules; -import com.iformall.enums.EnumScoreType; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.WxCUserService; @@ -56,7 +53,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { wxScoreRules.setCreateDate(new Date()); wxScoreRules.setUpdateDate(new Date()); wxScoreRules.setType(EnumScoreRules.CREDIT.getCode()); - wxScoreRules.setCreditLocked(1); + wxScoreRules.setCreditLocked(EnumCreditLockedStatus.OPEN.getCode()); wxScoreRulesMapper.insert(wxScoreRules); wxScoreRules = new WxScoreRules(); wxScoreRules.setTenantId(tenantId); @@ -64,7 +61,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { wxScoreRules.setCreateDate(new Date()); wxScoreRules.setUpdateDate(new Date()); wxScoreRules.setType(EnumScoreRules.SCORE.getCode()); - wxScoreRules.setCreditLocked(0); + wxScoreRules.setCreditLocked(EnumCreditLockedStatus.CLOSE.getCode()); wxScoreRulesMapper.insert(wxScoreRules); }