|
|
@@ -38,7 +38,6 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
|
|
|
private static final String URL_API = "";
|
|
|
|
|
|
|
|
|
-
|
|
|
@Autowired
|
|
|
private WechatAuthProperties wechatAuthProperties;
|
|
|
|
|
|
@@ -93,9 +92,8 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
|
|
|
headers.put(CommonConstant.HTTP_USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
|
|
|
}
|
|
|
|
|
|
- if (!headers.containsKey(CommonConstant.USER_ID)) {
|
|
|
- headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
|
|
|
- }
|
|
|
+ headers.put(CommonConstant.USER_ID, StringUtil.isEmpty(pd.getUserId()) ? "-1" : pd.getUserId());
|
|
|
+
|
|
|
if (!headers.containsKey(CommonConstant.HTTP_APP_ID)) {
|
|
|
headers.put(CommonConstant.HTTP_APP_ID, pd.getAppId());
|
|
|
|
|
|
@@ -383,7 +381,7 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
|
|
|
Assert.hasLength(pd.getUserId(), "用户未登录请先登录");
|
|
|
|
|
|
ResultVo resultVo = getCommunityStoreInfoSMOImpl.getStoreInfo(pd, restTemplate, pd.getUserId());
|
|
|
- logger.debug("查询商户信息 getStoreInfo :{}",resultVo.toString());
|
|
|
+ logger.debug("查询商户信息 getStoreInfo :{}", resultVo.toString());
|
|
|
return new ResponseEntity<String>(resultVo.getMsg(), resultVo.getCode() == ResultVo.CODE_OK ? HttpStatus.OK : HttpStatus.BAD_REQUEST);
|
|
|
}
|
|
|
|