Преглед на файлове

fix:“修复查询子账号管理设备”

soobin преди 2 години
родител
ревизия
8c92ec944d
променени са 2 файла, в които са добавени 11 реда и са изтрити 8 реда
  1. 4 0
      src/main/java/com/szwl/controller/TAdminController.java
  2. 7 8
      src/main/java/com/szwl/controller/TEquipmentController.java

+ 4 - 0
src/main/java/com/szwl/controller/TAdminController.java

@@ -516,6 +516,10 @@ public class TAdminController {
             }
             if (registerParam.getCompanyType().equals("1")) { // 如果是七云平台
                 admin.setTradeMerchantNo("777138500523174"); //七云商户报备号
+                // TODO 汇付上线后改为“1”
+                admin.setPayPlatform("0");
+            } else {
+                admin.setPayPlatform("0");
             }
             boolean b = tAdminService.save(admin);
 

+ 7 - 8
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -306,17 +306,16 @@ public class TEquipmentController {
     @GetMapping("/getClientIds")
     public ResponseModel<List<String>> getClientIds(@RequestParam String adminId) {
         //查找属于这个商家子账户的设备
-        LambdaQueryWrapper<TEquipment> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TEquipment::getAdminId,adminId);
-        List<TEquipment> list = tEquipmentService.list(queryWrapper);
-//        String equipmentIds = adminEquipment.getEquipmentIds();
+        TAdminEquipment adminEquipment = tAdminEquipmentService.getById(adminId);
+        String equipmentIds = adminEquipment.getEquipmentIds();
         // 分割保存在设备ID保存在list
-//        String[] tEquipmentIds = equipmentIds.split(",");
-//        List<String> list = Arrays.asList(tEquipmentIds);
+        String[] tEquipmentIds = equipmentIds.split(",");
+        List<String> list = Arrays.asList(tEquipmentIds);
         List<String> returnList = new ArrayList<>();
         if (list.size() > 0) {
-            for (TEquipment tEquipment : list) {
-                returnList.add(tEquipment.getClientId());
+            for (String id : list) {
+                TEquipment equipment = tEquipmentService.getById(id);
+                returnList.add(equipment.getClientId());
             }
         }
         return R.ok(returnList);