占桩订单表添加车牌号字段

jsowell-admin/src/main/java/com/jsowell/service/CameraService.java

@@ -10,6 +10,7 @@ import com.jsowell.common.util.file.AliyunOssUploadUtils;
 import com.jsowell.common.util.file.ImageUtils;
 import com.jsowell.common.util.sign.MD5Util;
 import com.jsowell.netty.server.mqtt.BootNettyMqttChannelInboundHandler;
+import com.jsowell.pile.domain.OrderPileOccupy;
 import com.jsowell.pile.domain.PileCameraInfo;
 import com.jsowell.pile.dto.camera.Camera2GroundLockCommand;
 import com.jsowell.pile.dto.camera.CameraHeartBeatDTO;
@@ -18,6 +19,7 @@ import com.jsowell.pile.service.MemberBasicInfoService;
 import com.jsowell.pile.service.PileCameraInfoService;
 import com.jsowell.pile.service.OrderPileOccupyService;
 import com.jsowell.pile.vo.uniapp.MemberVO;
+import com.jsowell.pile.vo.web.OccupyOrderVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -134,10 +136,15 @@ public class CameraService {
             return;
         }
         // 先判断该车牌是否有挂起未支付的占桩订单
-
-        // 如果有占桩订单，则先提醒“需支付占桩订单”
-
-
+        OrderPileOccupy occupy = OrderPileOccupy.builder()
+                .status("2") // 2-订单挂起
+                .plateNumber(plateNumber)
+                .build();
+        List<OccupyOrderVO> occupyList = orderPileOccupyService.getOrderPileOccupyList(occupy);
+        // todo 如果有占桩订单，则先提醒“需支付占桩订单”
+        if (CollectionUtils.isNotEmpty(occupyList)) {
+            return;
+        }
         // 根据车牌号找出绑定小程序的用户
         List<MemberVO> memberList = memberBasicInfoService.getMemberInfoByPlateNumber(plateNumber);
         if (CollectionUtils.isNotEmpty(memberList)) {
@@ -155,8 +162,10 @@ public class CameraService {
                     .build();
             String msgId = sendGroundLockMsg(command);
             // 判断降锁是否成功
+            String redisKey = "plate_number_occupy_order:" + msgId;
 
-            // 降锁成功，生成占桩订单
+
+            // 降锁成功，生成占桩订单(挂起、未支付)
 
         } else {
             // 如果没有小程序账号，再根据此车牌是否有挂起的占桩订单