Merge branch 'dev' into dev-lms

share-system/src/main/java/share/system/service/impl/DeviceOpServiceImpl.java

@@ -157,7 +157,7 @@ public class DeviceOpServiceImpl implements DeviceOpService {
                 }
                 if (DeviceType.DEVICE_0001.getCode().equals(device.getDevType())) {
                     // 取电开关
-                    this.deviceOpInit(device.getDevId(), deviceParam.getPhone(), OpTypeEnum.GET_ELECTRIC.getCode(), true, 2L);
+                    this.deviceOpInit(device.getDevId(), deviceParam.getPhone(), OpTypeEnum.GET_ELECTRIC.getCode(), true, 4L);
                 }
             }
 
@@ -182,7 +182,7 @@ public class DeviceOpServiceImpl implements DeviceOpService {
                 }
                 if (DeviceType.DEVICE_0001.getCode().equals(device.getDevType())) {
                     // 取电开关
-                    this.deviceOpInit(device.getDevId(), phone, OpTypeEnum.GET_ELECTRIC.getCode(), true, 2L);
+                    this.deviceOpInit(device.getDevId(), phone, OpTypeEnum.GET_ELECTRIC.getCode(), true, 4L);
                 }
             }
 

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -357,6 +357,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             if (ObjectUtil.isNull(user)) {
                 throw new BaseException("您的登录已过期，请先登录");
             }
+            if (StringUtils.isEmpty(user.getPhone())) {
+                user = sConsumerService.getById(user.getId());
+                if (StringUtils.isEmpty(user.getPhone())) {
+                    throw new BaseException("请绑定手机号");
+                }
+            }
             SStore sStore = storeService.getById(request.getStoreId());
             SRoom room = roomService.getById(request.getRoomId());
             if (ObjectUtil.isNotEmpty(room) && room.getIsDirtyRoom().equals(YesNoEnum.yes.getIndex())) {
@@ -962,6 +968,12 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 throw new BaseException("订单更新失败");
             }
         }
+        //判断房间是否是脏房，脏房新增保洁订单
+        SRoomVo sRoomVo = roomService.selectSRoomById(sOrder.getRoomId());
+        if (sRoomVo.getIsDirtyRoom().equals(YesNoEnum.yes.getIndex())) {
+            //新增保洁任务
+            cleanRecordsService.addSCleanRecords(sOrder.getStoreId(), sOrder.getRoomId());
+        }
         return Boolean.TRUE;
     }