UserMessage

src/main/java/com/mmc/payment/service/Impl/RepoCashServiceImpl.java

@@ -93,7 +93,7 @@ public class RepoCashServiceImpl implements RepoCashService {
             }
         }
 
-        ResponseEntity<String> responseEntity = UserId(cuser.getUserAccountId());
+        ResponseEntity<String> responseEntity = UserId(cuser.getUserAccountId(), cuser.getToken());
         UserAccountSimpleDTO account = JSON.parseObject(responseEntity.getBody(), UserAccountSimpleDTO.class);
         list.stream().forEach(t -> {
             if (t.getCreateUser().equals(account.getId())) {
@@ -139,7 +139,7 @@ public class RepoCashServiceImpl implements RepoCashService {
         /**
          * 用户信息
          */
-        ResponseEntity<String> responseEntity = UserId(cash.getRepoAccountId());
+        ResponseEntity<String> responseEntity = UserId(cash.getRepoAccountId(), cuser.getToken());
         UserAccountSimpleDTO account = JSON.parseObject(responseEntity.getBody(), UserAccountSimpleDTO.class);
         if (account == null) {
             return ResultBody.error(ResultEnum.FEIGN_REPOUSER_SERVLET_ERROR);
@@ -200,7 +200,7 @@ public class RepoCashServiceImpl implements RepoCashService {
         /**
          * 用户信息
          */
-        ResponseEntity<String> responseEntity = UserId(repoAccountId);
+        ResponseEntity<String> responseEntity = UserId(repoAccountId, cuser.getToken());
         UserAccountSimpleDTO account = JSON.parseObject(responseEntity.getBody(), UserAccountSimpleDTO.class);
         if (account == null) {
             return ResultBody.error(ResultEnum.FEIGN_REPOUSER_SERVLET_ERROR);
@@ -266,14 +266,20 @@ public class RepoCashServiceImpl implements RepoCashService {
         return null;
     }
 
-    private ResponseEntity<String> UserId(Integer repoAccountId) {
+    private ResponseEntity<String> UserId(Integer repoAccountId, String token) {
         // 用户信息
-        ResponseEntity<String> response =
+     /*   ResponseEntity<String> response =
                 restTemplate.getForEntity(
                         userAppUrl
                                 + "user-account/feignGetUserSimpleInfo?userAccountId="
                                 + repoAccountId,
-                        String.class);
+                        String.class);*/
+        HttpHeaders headers = new HttpHeaders();
+        //封装请求头
+        headers.add("token", token);
+        HttpEntity<MultiValueMap<String, Object>> formEntity = new HttpEntity<MultiValueMap<String, Object>>(headers);
+        ResponseEntity<String> response = restTemplate.exchange(userAppUrl + "user-account/feignGetUserSimpleInfo?userAccountId=" + repoAccountId,
+                HttpMethod.GET, formEntity, String.class);
         return response;
     }
 
@@ -289,7 +295,7 @@ public class RepoCashServiceImpl implements RepoCashService {
             return body;
         }
         // 用户信息
-        ResponseEntity<String> response = UserId(cash.getRepoAccountId());
+        ResponseEntity<String> response = UserId(cash.getRepoAccountId(), cuser.getToken());
         String body1 = response.getBody();
         UserAccountSimpleDTO account = JSON.parseObject(body1, UserAccountSimpleDTO.class);
         if (account == null) {
@@ -495,14 +501,14 @@ public class RepoCashServiceImpl implements RepoCashService {
 
     @Override
     public ResultBody walletUsers(WalletUsersVO walletUsersVO) {
-        ResponseEntity<String> response = UserId(walletUsersVO.getRepoAccountId());
-        String body1 = response.getBody();
-        UserAccountSimpleDTO account = JSON.parseObject(body1, UserAccountSimpleDTO.class);
-        if (account == null) {
+        //  ResponseEntity<String> response = UserId(walletUsersVO.getRepoAccountId(),walletUsersVO.get);
+        // String body1 = response.getBody();
+        //UserAccountSimpleDTO account = JSON.parseObject(body1, UserAccountSimpleDTO.class);
+       /* if (account == null) {
             return ResultBody.error(ResultEnum.FEIGN_REPOUSER_SERVLET_ERROR);
         } else if (account.getPortType().equals(PortTypeEnum.ADMIN_ACCOUNTS.getCode())) {
             return ResultBody.error(ResultEnum.NO_WALLET_FUNCTION);
-        }
+        }*/
         WalletUsersQO properties = BeanCopyUtils.properties(walletUsersVO, new WalletUsersQO());
         Integer walletUsers = repoCashDao.findWalletUsers(properties);
         if (walletUsers != null) {