Commit e4bcd3ea authored by 曾水平's avatar 曾水平

优化

parent a101119f
...@@ -79,6 +79,7 @@ public class AppController { ...@@ -79,6 +79,7 @@ public class AppController {
// 保存入库 // 保存入库
Long id = accessTokenUtils.saveAccessToken(jdAppEnum, accessTokenByCode, shopJosResult); Long id = accessTokenUtils.saveAccessToken(jdAppEnum, accessTokenByCode, shopJosResult);
object.put("save", id);
if (id != null && id > 0) { if (id != null && id > 0) {
object.put("id", accessTokenUtils.getAccessToken(shopJosResult.getVenderId(), shopJosResult.getShopId()).getShopId()); object.put("id", accessTokenUtils.getAccessToken(shopJosResult.getVenderId(), shopJosResult.getShopId()).getShopId());
} }
...@@ -96,9 +97,6 @@ public class AppController { ...@@ -96,9 +97,6 @@ public class AppController {
public Result<JSONObject> getShopInfoVO(Long venderId, Long shopId) { public Result<JSONObject> getShopInfoVO(Long venderId, Long shopId) {
try { try {
TbShopAccessTokenDto accessToken = accessTokenUtils.getAccessToken(venderId, shopId); TbShopAccessTokenDto accessToken = accessTokenUtils.getAccessToken(venderId, shopId);
if (accessToken == null) {
return ResultBuilder.fail("未授权");
}
JdAppEnum jdAppEnum = JdAppEnum.getAppByAppKey(accessToken.getAppKey()); JdAppEnum jdAppEnum = JdAppEnum.getAppByAppKey(accessToken.getAppKey());
Result<ShopJosResult> shopJosResultResult = jdApiUtil.venderShopQuery(jdAppEnum, accessToken.getAccessToken()); Result<ShopJosResult> shopJosResultResult = jdApiUtil.venderShopQuery(jdAppEnum, accessToken.getAccessToken());
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
......
...@@ -36,7 +36,7 @@ public class TbShopAccessTokenDaoImpl extends BaseDao implements TbShopAccessTok ...@@ -36,7 +36,7 @@ public class TbShopAccessTokenDaoImpl extends BaseDao implements TbShopAccessTok
Map<String, Long> param = Maps.newHashMap(); Map<String, Long> param = Maps.newHashMap();
param.put("venderId", venderId); param.put("venderId", venderId);
param.put("shopId", shopId); param.put("shopId", shopId);
return selectOne("queryByVenderIdShopId", param); return selectList("queryByVenderIdShopId", param);
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment