diff --git a/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java b/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java
index 6b01fa5..be020fd 100644
--- a/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java
+++ b/src/main/java/com/gxwebsoft/apps/controller/EquipmentController.java
@@ -56,8 +56,6 @@ public class EquipmentController extends BaseController {
     @Resource
     private EquipmentRecordService equipmentRecordService;
 
-    @PreAuthorize("hasAuthority('apps:equipment:list')")
-    @OperationLog
     @ApiOperation("分页查询设备管理")
     @GetMapping("/page")
     public ApiResult<PageResult<Equipment>> page(EquipmentParam param) {
@@ -68,8 +66,6 @@ public class EquipmentController extends BaseController {
         return success(equipmentService.pageRel(param));
     }
 
-    @PreAuthorize("hasAuthority('apps:equipment:list')")
-    @OperationLog
     @ApiOperation("查询全部设备管理")
     @GetMapping()
     public ApiResult<List<Equipment>> list(EquipmentParam param) {
diff --git a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
index 88616a1..878599a 100644
--- a/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/apps/service/impl/EquipmentServiceImpl.java
@@ -44,7 +44,6 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
         PageParam<Equipment, EquipmentParam> page = new PageParam<>(param);
         page.setDefaultOrder("create_time desc");
         List<Equipment> list = baseMapper.selectPageRel(page, param);
-
         Set<Integer> touziUserIds = list.stream().map(Equipment::getTouziUserId).collect(Collectors.toSet());
         //        List<User> touziUserList = userService.lambdaQuery().in(User::getUserId, touziUserIds).list();
         Map<Integer, User> touziUserCollect = null;
@@ -54,13 +53,14 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
                 touziUserCollect = touziUserList.stream().collect(Collectors.toMap(User::getUserId, e->e));
             }
         }
-
+      System.out.println("touziUserCollect = " + touziUserCollect);
         // 查询绑定电池的用户
         for (Equipment equipment : list) {
             // 查询状态
             System.out.println("equipment.getEquipmentCode() = " + equipment.getEquipmentCode());
             try {
                 ResponseEntity<JSONObject> entity = restTemplate.getForEntity("http://battery.zfdliot.com/api/battery/status?battery_sn=" + equipment.getEquipmentCode(), JSONObject.class);
+              System.out.println("entity = " + entity);
                 JSONObject body = entity.getBody();
                 Integer code = body.getInteger("code");
                 JSONObject data = body.getJSONObject("data");
diff --git a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
index 1845291..0fcc439 100644
--- a/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
+++ b/src/main/java/com/gxwebsoft/open/controller/OpenEquipmentController.java
@@ -308,7 +308,13 @@ public class OpenEquipmentController extends BaseController {
         // 订单信息
         Integer orderId = equipment.getOrderId();
         Order order = orderService.getById(orderId);
+        if (order == null) {
+            return fail("订单不存在");
+        }
         Integer oldEqId = order.getEquipmentId();
+        if (oldEqId == null) {
+            return fail("订单未绑定设备");
+        }
 
         // 新电池
         Equipment one = equipmentService.getByEquipmentCode(equipmentCode);
@@ -319,6 +325,9 @@ public class OpenEquipmentController extends BaseController {
         String newMerchantCode = one.getMerchantCode();
         // 旧电池
         Equipment old = equipmentService.getById(oldEqId);
+        if (old == null) {
+            return fail("旧设备不存在");
+        }
         String oldMerchantCode = order.getMerchantCode();
 
         Integer userId = one.getUserId();
@@ -381,7 +390,7 @@ public class OpenEquipmentController extends BaseController {
             param.put("userPhone", order.getPhone());
             param.put("battery_sn", one.getEquipmentCode());
             System.out.println("param2 = " + param);
-            ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity("https://battery.zfdliot.com/api/battery/batteryBindUser", param, JSONObject.class);
+            ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity("http://battery.zfdliot.com/api/battery/batteryBindUser", param, JSONObject.class);
             JSONObject body = responseEntity.getBody();
             log.info("电池更换调用第三方返回：{}", body);
             return success("换电成功");
@@ -525,6 +534,7 @@ public class OpenEquipmentController extends BaseController {
             refund.setApplyDesc(isRefund == 3?"强制退租":"申请退租");//3强制退租（后台操作）
             refund.setRefundMoney(new BigDecimal(0));
             refund.setMerchantCode(order.getMerchantCode());
+            refund.setUpdateTime(DateUtil.date());
         }
         refund.setAuditStatus(10);
         refund.setOrderNo(order.getOrderNo());
diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java
index 96f512f..6d93235 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/OrderController.java
@@ -377,14 +377,14 @@ public class OrderController extends BaseController {
                 //.ge(Order::getCreateTime,DateUtil.offsetMonth(new Date(),-6))//最近三个6个月
                 .orderByDesc(Order::getCreateTime)
                 .list();
-        if (overdueOrderList != null && !overdueOrderList.isEmpty()) {
-            for(Order overdueOrder:overdueOrderList){
-                if (overdueOrder.getRestDay()<0){//如果剩余天数为负数
-                    log.warn("添加订单失败，有订单逾期未结 userId:{},orderId:{},orderNo:{},restDay:{}",loginUser.getUserId(),overdueOrder.getOrderId(),overdueOrder.getOrderNo(),overdueOrder.getRestDay());
-                    return fail("添加订单失败，有订单逾期未结");
-                }
-            }
-        }
+//        if (overdueOrderList != null && !overdueOrderList.isEmpty()) {
+//            for(Order overdueOrder:overdueOrderList){
+//                if (overdueOrder.getRestDay()<0){//如果剩余天数为负数
+//                    log.warn("添加订单失败，有订单逾期未结 userId:{},orderId:{},orderNo:{},restDay:{}",loginUser.getUserId(),overdueOrder.getOrderId(),overdueOrder.getOrderNo(),overdueOrder.getRestDay());
+//                    return fail("添加订单失败，有订单逾期未结");
+//                }
+//            }
+//        }
         // 历史订单
         order.setCurrPeriods(0);
 
diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
index dd6a197..c0fe1c6 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
@@ -2,6 +2,7 @@ package com.gxwebsoft.shop.controller;
 
 import cn.hutool.core.bean.copier.BeanCopier;
 import cn.hutool.core.bean.copier.CopyOptions;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
@@ -114,12 +115,12 @@ public class OrderRefundController extends BaseController {
     @PutMapping()
     @Transactional
     public ApiResult<?> update(@RequestBody OrderRefund orderRefund) throws AlipayApiException {
-        OrderRefund refund = orderRefundService.getById(orderRefund.getOrderRefundId());
-        BeanCopier.create(orderRefund, refund, CopyOptions.create().ignoreNullValue()).copy();
+
+        BeanCopier.create(orderRefund, orderRefund, CopyOptions.create().ignoreNullValue()).copy();
 
         User loginUser = getLoginUser();
         if (loginUser != null) {
-            refund.setOperator(loginUser.getUsername());//操作人
+          orderRefund.setOperator(loginUser.getUsername());//操作人
         }
 
         Integer auditStatus = orderRefund.getAuditStatus();
@@ -141,6 +142,7 @@ public class OrderRefundController extends BaseController {
             }
             order.setReceiptStatus(RECEIPT_STATUS_RETURN);
             order.setOrderStatus(ORDER_STATUS_OVER);
+            order.setUpdateTime(DateUtil.date());
             orderService.updateById(order);
             try {
                 freezeOrderService.unfreeze(order.getOrderId(), refundMoney);//这里有可能出现没有找不到解冻订单的问题
@@ -155,7 +157,8 @@ public class OrderRefundController extends BaseController {
             order.setReceiptStatus(RECEIPT_STATUS_YES);
             orderService.updateById(order);
         }
-        orderRefundService.updateById(refund);
+        orderRefund.setUpdateTime(DateUtil.date());
+        orderRefundService.updateById(orderRefund);
         return success("操作成功");
     }
 
diff --git a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
index 799017f..34cb840 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
@@ -408,6 +408,7 @@ public class PaymentController extends BaseController {
 
             order.setCurrPeriods(parentOrder.getCurrPeriods());
             order.setBatteryRent(parentOrder.getBatteryRent());
+            order.setExpirationTime(DateUtil.offset(order.getExpirationTime(), DateField.MONTH, 1));
             orderPayService.updateById(order);
             orderService.updateById(parentOrder);