添加系统密码用户修改时效接口，添加自定义密码用户修改时效接口，修改菜单栏接口

src/main/java/com/template/api/UnlockingAdminControllerAPI.java

@@ -32,7 +32,7 @@ public interface UnlockingAdminControllerAPI {
     CommonResult deleteLock(@RequestParam Integer unlockingAdminId);
 
     @PostMapping("/updateLock")
-    @ApiOperation(value = "修改锁的用户", notes = "指纹管理", httpMethod = "PSOT")
+    @ApiOperation(value = "修改锁的用户", notes = "修改锁的用户", httpMethod = "PSOT")
     CommonResult updateLock(@RequestBody UpdateLockDto updateLockDto);
 
 }

src/main/java/com/template/api/UnlockingCustomControllerAPI.java

@@ -3,6 +3,7 @@ package com.template.api;
 import com.template.model.dto.CustomKeyCardDto;
 import com.template.model.dto.CustomKeyFingerprintDto;
 import com.template.model.dto.CustomKeyPassWordDto;
+import com.template.model.dto.UpdateLockDto;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -26,4 +27,8 @@ public interface UnlockingCustomControllerAPI {
     @ApiOperation(value = "删除锁的用户", notes = "解绑", httpMethod = "GET")
     CommonResult deleteLock(@RequestParam Integer unlockingCustomId);
 
+    @PostMapping("/updateLock")
+    @ApiOperation(value = "修改锁的用户", notes = "修改锁的用户", httpMethod = "PSOT")
+    CommonResult updateLock(@RequestBody UpdateLockDto updateLockDto);
+
 }

src/main/java/com/template/controller/HouseOrderController.java

@@ -2442,7 +2442,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
                     System.out.println(TimeExchange.getTime() + "微信退款返回的信息：" + h5Refund);
                     RefundRecord rpr = new RefundRecord();
-                    rpr.setHouseOrderId(payRecord.getId());
+                    rpr.setHouseOrderId(houseOrder.getId());
                     rpr.setRefundNo(refund_no);
                     rpr.setUserId(Integer.valueOf(houseOrder.getReserveUserId()));
                     rpr.setRefundPrice(new BigDecimal(total).divide(new BigDecimal("100")).setScale(2));
@@ -2450,7 +2450,7 @@ public class HouseOrderController implements HouseOrderAPI {
                     rpr.setRemark("发起微信支付退款金额：" + total + "- " + TimeExchange.getTime());
                     houseOrder.setOrderStatus("6");
                     houseOrderService.updateById(houseOrder);
-                    refundRecordService.updateById(rpr);
+                    refundRecordService.save(rpr);
                     houseNumberStateService.updateById(houseNumberState);
                     return CommonResult.ok(h5Refund);
                 }

src/main/java/com/template/controller/LoginController.java

@@ -579,6 +579,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo14.setFunctionPoint("解绑设备");
                 functionPointVo14.setStatus(1);
                 vos8.add(functionPointVo14);
+
+                FunctionPointVo functionPointVo15 = new FunctionPointVo();
+                functionPointVo15.setFunctionPoint("NFC设置");
+                functionPointVo15.setStatus(1);
+                vos8.add(functionPointVo15);
             } else {
                 FunctionPointVo functionPointVo5 = ifContains(doorLockManagement, "5");
                 functionPointVo5.setFunctionPoint("导出");
@@ -604,6 +609,11 @@ public class LoginController implements LoginControllerAPI {
                 FunctionPointVo functionPointVo14 = ifContains(doorLockManagement, "14");
                 functionPointVo14.setFunctionPoint("解绑设备");
                 vos8.add(functionPointVo14);
+
+                FunctionPointVo functionPointVo15 = ifContains(doorLockManagement, "15");
+                functionPointVo15.setFunctionPoint("NFC设置");
+                vos8.add(functionPointVo15);
+
             }
 
             menuBarVo8.setFunctionPoints(vos8);

src/main/java/com/template/controller/PasswordIssController.java

@@ -659,4 +659,28 @@ public class PasswordIssController {
         }
 
     }
+
+    public void updateLock(String lockUserId, String luid, String startTime, String endTime) {
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        long start = LocalDateTime.parse(startTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+        long end = LocalDateTime.parse(endTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("luid", luid);//"80A036AEA1D3");
+        map.put("categoryId", doorLockConfig.getCategoryId());//"d0c248256f8346d2a19afa296562b319");//设备分类ID 所有蓝牙wifi锁默认统一值
+        map.put("id", lockUserId);// 用户名 也就是管理锁的账号
+        map.put("startTime", start);
+        map.put("endTime", end);
+
+        String jsonContent = JSONObject.toJSONString(map);
+
+        try {
+            JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.ModifyPassword.getUrl());
+            JSONObject data = jsonObject.getJSONObject("data");
+            System.out.println("data = " + data);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
 }

src/main/java/com/template/controller/UnlockingAdminController.java

@@ -277,9 +277,23 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
             return CommonResult.fail("不存在该记录");
         }
 
+        String lockStatus = byId.getLockStatus();
+        if (!"1".equals(lockStatus)) {
+            return CommonResult.fail("只有密码用户才能修改时效");
+        }
+        String lockUserId = byId.getLockUserId();
         String luid = byId.getLuid();
+        String startTime = updateLockDto.getStartTime();
+        String endTime = updateLockDto.getEndTime();
+
+        passwordIssController.updateLock(lockUserId,luid,startTime,endTime);
 
-        return null;
+        byId.setStartTime(startTime);
+        byId.setEndTime(endTime);
+
+        unlockingAdminService.updateById(byId);
+
+        return CommonResult.ok();
     }
 
 

src/main/java/com/template/controller/UnlockingCustomController.java

@@ -7,6 +7,7 @@ import com.template.common.utils.PasswordChecker;
 import com.template.model.dto.CustomKeyCardDto;
 import com.template.model.dto.CustomKeyFingerprintDto;
 import com.template.model.dto.CustomKeyPassWordDto;
+import com.template.model.dto.UpdateLockDto;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.services.*;
@@ -240,5 +241,31 @@ public class UnlockingCustomController implements UnlockingCustomControllerAPI {
         return CommonResult.ok();
     }
 
+    @Override
+    public CommonResult updateLock(UpdateLockDto updateLockDto) {
+        UnlockingCustom byId = unlockingCustomService.getById(updateLockDto.getUnlockingAdminId());
+        if (ObjectUtils.isEmpty(byId)) {
+            return CommonResult.fail("不存在该记录");
+        }
+
+        String lockStatus = byId.getLockStatus();
+        if (!"1".equals(lockStatus)) {
+            return CommonResult.fail("只有密码用户才能修改时效");
+        }
+        String lockUserId = byId.getLockUserId();
+        String luid = byId.getLuid();
+        String startTime = updateLockDto.getStartTime();
+        String endTime = updateLockDto.getEndTime();
+
+        passwordIssController.updateLock(lockUserId,luid,startTime,endTime);
+
+        byId.setStartTime(startTime);
+        byId.setEndTime(endTime);
+
+        unlockingCustomService.updateById(byId);
+
+        return CommonResult.ok();
+    }
+
 }
 

src/main/java/com/template/model/enumModel/PasswordUrlEnum.java

@@ -16,6 +16,7 @@ public enum PasswordUrlEnum {
     GetLockDeviceList("getLockDeviceList","获得门锁设备信息列表"),
     RemoteOpen("remoteOpen","远程开锁"),
     SetNFC("setNFC","设置NFC"),
+    ModifyPassword("modifyPassword","修改密码"),
     BatchModifyUserValidTimeRequest("batchModifyUserValidTimeRequest","批量修改用户时效");
     String url;
     String dsc;