guozhaoshun 6 лет назад
Родитель
Сommit
554da3762f

+ 2 - 2
rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserClient.java

@@ -45,7 +45,7 @@ public interface UserClient {
     List<UserTag> findUserTagByCodeUid(@PathVariable("code") String code, @RequestParam("uid") String uid);
 
     @RequestMapping(value = "/device/updatebind", method = RequestMethod.PUT)
-    APIResult<TerminalDeviceVo> updateDeviceBind(TerminalDeviceDTO deviceDTO);
+    APIResult updateDeviceBind(TerminalDeviceDTO deviceDTO);
 
 
     @Component
@@ -97,7 +97,7 @@ public interface UserClient {
         }
 
         @Override
-        public APIResult<TerminalDeviceVo> updateDeviceBind(TerminalDeviceDTO deviceDTO) {
+        public APIResult updateDeviceBind(TerminalDeviceDTO deviceDTO) {
             return APIResult.error(ApiWebCode.SERVER_ERROR);
         }
 

+ 1 - 1
rankin-api-web/src/main/java/cn/rankin/apiweb/service/user/UserService.java

@@ -242,7 +242,7 @@ public class UserService {
         deviceDTO.setMerchant(terminalDeviceVo.getMerchant());
         deviceDTO.setDeviceCode(terminalDeviceVo.getDeviceCode());
         deviceDTO.setUserId(terminalDeviceVo.getUserId());
-        APIResult<TerminalDeviceVo> apiResult = userClient.updateDeviceBind(deviceDTO);
+        APIResult apiResult = userClient.updateDeviceBind(deviceDTO);
         if (!apiResult.getSuccess()) {
             log.error("update bind user api error");
             throw new RuntimeException("update bind user api error");

+ 1 - 1
rankin-user-service/src/main/java/cn/rankin/userservice/controller/TerminalDeviceController.java

@@ -24,7 +24,7 @@ public class TerminalDeviceController {
     }
 
     @RequestMapping(value = "/updatebind", method = RequestMethod.PUT)
-    public APIResult<TerminalDevice> updatebind(@Valid @RequestBody TerminalDeviceDTO terminalDeviceDTO) {
+    public APIResult updatebind(@Valid @RequestBody TerminalDeviceDTO terminalDeviceDTO) {
         return terminalDeviceService.updatebind(terminalDeviceDTO);
     }
 

+ 3 - 3
rankin-user-service/src/main/java/cn/rankin/userservice/service/TerminalDeviceService.java

@@ -93,7 +93,7 @@ public class TerminalDeviceService {
         return terminalDeviceList;
     }
 
-    public APIResult<TerminalDevice> updatebind(TerminalDeviceDTO terminalDeviceDTO) {
+    public APIResult updatebind(TerminalDeviceDTO terminalDeviceDTO) {
         if(StringUtils.isBlank(terminalDeviceDTO.getId())){
             return APIResult.error(UserServiceAPICode.PARAMETER_ERROR);
         }
@@ -104,8 +104,8 @@ public class TerminalDeviceService {
         }
         terminalDevice.setMerchant(terminalDeviceDTO.getMerchant());
 
-        TerminalDevice device = terminalDeviceRepository.update(terminalDevice);
+        terminalDeviceRepository.update(terminalDevice);
 
-        return APIResult.ok(device);
+        return APIResult.ok();
     }
 }