fix

rankin-user-service/src/main/java/cn/rankin/userservice/repository/TerminalDeviceRepository.java

@@ -23,4 +23,6 @@ public interface TerminalDeviceRepository extends BasicJpaRepository<TerminalDev
     @Modifying
     Integer deleteByDeviceCodeAndMerchant(String code, String merchant);
 
+    @Modifying
+    Integer deleteByUserIdAndMerchant(String userId, String merchant);
 }

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

@@ -38,7 +38,9 @@ public class TerminalDeviceService {
                 return APIResult.error(UserServiceAPICode.USER_IS_BOUND);
             }else{
                 //根据设备号，merchant,删除设备绑定记录,后面会重新添加绑定关系
-                deleteTerminalDeviceByDeviceCodeMerchant(deviceCode, merchant);
+                //deleteTerminalDeviceByDeviceCodeMerchant(deviceCode, merchant);
+                //根据设备号，merchant,删除设备绑定记录,后面会重新添加绑定关系
+                deleteTerminalDeviceByUidMerchant(userId, merchant);
                 terminalDeviceBindLogService.insert(deviceCode, merchant, userId, brand, ip, modelNo, terminal+"_del");
             }
         }
@@ -58,6 +60,11 @@ public class TerminalDeviceService {
         return APIResult.ok(deviceBind);
     }
 
+    private void deleteTerminalDeviceByUidMerchant(String userId, String merchant) {
+        terminalDeviceRepository.deleteByUserIdAndMerchant(userId, merchant);
+        terminalDeviceRepository.deleteByUserIdAndMerchant(userId, null);
+    }
+
     private void deleteTerminalDeviceByDeviceCodeMerchant(String deviceCode, String merchant) {
         terminalDeviceRepository.deleteByDeviceCodeAndMerchant(deviceCode, merchant);
         terminalDeviceRepository.deleteByDeviceCodeAndMerchant(deviceCode, null);