diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java
index 2e22a5e..9f88acc 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java
@@ -131,4 +131,11 @@ public interface MaLeaseInfoMapper {
     List<MaLeaseInfo> getLeaseStatusCount(MaLeaseInfo info);
 
     List<MaLeaseInfo> getLeaseCountByPublishCompany();
+
+    /**
+     * 驳回时修改信息
+     * @param maLeaseInfo
+     * @return
+     */
+    int updateRejectDevInfo(MaLeaseInfo maLeaseInfo);
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java
index 0f47852..a87e34f 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java
@@ -426,6 +426,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public AjaxResult agreeOrReject(MaLeaseInfo maLeaseInfo) {
         int result = 0;
         if (maLeaseInfo.getId() == null) {
@@ -461,7 +462,6 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService {
         }
         if (maLeaseInfo.getLeaseStatus() == 4) {
             maLeaseInfo.setRejectUser(String.valueOf(SecurityUtils.getUserId()));
-            result = leaseInfoMapper.updateDevInfo(maLeaseInfo);
             MaLeaseInfo leaseInfo = leaseInfoMapper.getDevInfoById(maLeaseInfo.getId());
             BmMessage bmMessage = new BmMessage();
             bmMessage.setCreateTime(DateUtils.getNowDate());
@@ -485,6 +485,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService {
             list.add(bmMessage);
             (SpringUtils.getBean(RedisService.class)).setCacheObject(msgKey, list, MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_HOURS, TimeUnit.HOURS);
             bmMessageMapper.insertBmMessage(bmMessage);
+            result = leaseInfoMapper.updateRejectDevInfo(maLeaseInfo);
         }
         return result > 0 ? AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg());
     }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
index 60f1f91..09a6fd6 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
@@ -312,6 +312,15 @@ public class OrderServiceImpl implements OrderService {
                 }
             }
         }
+        // 订单完成，修改装备为下架状态
+        if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_FINISHED.getStatus().toString())) {
+            if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) {
+                for (OrderDetailDto dto : dtos) {
+                    dto.setMaStatus(MaStatusEnum.ON_HIRE.getCode().toString());
+                    orderMapper.updateDeviceStatus(dto);
+                }
+            }
+        }
         String userName = SecurityUtils.getLoginUser().getUsername();
         Integer i = orderMapper.updateOrderStatus(orderInfoDto.getOrderId(), orderInfoDto.getMaIds(), orderInfoDto.getOrderStatus(), userName, orderInfoDto.getOrderRemark());
         if (!CollectionUtils.isEmpty(dtos)) {
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
index 985db09..85e3bdb 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml
@@ -105,6 +105,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where lease_id = #{id}
     </update>
 
+    <update id="updateRejectDevInfo">
+        update ma_lease_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="leaseName != null and leaseName != ''">lease_name = #{leaseName},</if>
+            <if test="provinceCode != null">province_code = #{provinceCode},</if>
+            <if test="cityCode != null">city_code = #{cityCode},</if>
+            <if test="areaCode != null">area_code = #{areaCode},</if>
+            <if test="address != null and address != ''">address = #{address},</if>
+            <if test="leaseStartTime != null ">lease_start_time = #{leaseStartTime},</if>
+            <if test="leaseEndTime != null ">lease_end_time = #{leaseEndTime},</if>
+            <if test="leaseStatus != null ">lease_status = #{leaseStatus},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="publishUser != null and publishUser != ''">publish_user = #{publishUser},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="person != null">person = #{person},</if>
+            <if test="personPhone != null">person_phone = #{personPhone},</if>
+            <if test="description != null and description != ''">description = #{description},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            order_user = NULL,
+            order_company = NULL,
+            order_time = NULL,
+            <if test="agreeUser != null">agree_user = #{agreeUser},</if>
+            <if test="rejectUser != null">reject_user = #{rejectUser},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
     <delete id="deleteById">
         delete from ma_lease_info where id = #{id}
     </delete>