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

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 {
             // 如果没有小程序账号，再根据此车牌是否有挂起的占桩订单

jsowell-admin/src/main/resources/application-dev.yml

@@ -36,8 +36,8 @@ spring:
     druid:
       # 主库数据源
       master:
-        #url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        #username: jsowell_dev
+#        url: jdbc:mysql://192.168.2.2:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        username: jsowell_dev
         url: jdbc:mysql://192.168.2.2:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: jsowell_prd_copy
         password: 123456

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OccupyOrderVO.java

@@ -17,6 +17,7 @@ public class OccupyOrderVO {
     private String status;
     private String memberId;
     private String stationId;
+    private String plateNumber;
     private String stationName;
     private String startTime;
     private String endTime;

jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml

@@ -978,6 +978,7 @@
             t1.STATUS,
             t1.member_id AS memberId,
             t1.station_id AS stationId,
+            t1.plate_number as plateNumber,
             t2.station_name AS stationName,
             t1.start_time AS startTime,
             t1.end_time AS endTime,
@@ -993,6 +994,8 @@
             <if test="occupyCode != null  and occupyCode != ''"> and t1.occupy_code = #{occupyCode}</if>
             <if test="memberId != null  and memberId != ''"> and t1.member_id = #{memberId}</if>
             <if test="stationId != null  and stationId != ''"> and t1.station_id = #{stationId}</if>
+            <if test="plateNumber != null  and plateNumber != ''"> and t1.plate_number = #{plateNumber}</if>
+            <if test="status != null  and status != ''"> and t1.status = #{status}</if>
             <if test="startTime != null "> and t1.start_time = #{startTime}</if>
             <if test="orderAmount != null "> and t1.order_amount = #{orderAmount}</if>
             <if test="pileSn != null  and pileSn != ''"> and t1.pile_sn = #{pileSn}</if>

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java

@@ -255,7 +255,8 @@ public class LianLianServiceImpl implements LianLianService {
         String dataSecret = "KnGhAb88GtUEPb0j";  // SPBNJ1Z5EQNmpK08  VTAEKDPVN9CUS7WO
         String dataSecretIV = "XZ4wURhuo2y8s4ZS"; // peRoTcb2C7zqKeII  83UZFFRRZDYNF5CR
         String signSecret = "sRjCDeokckFGpYpA";  // sRjCDeokckFGpYpA
-        String dataString = "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";
+        String dataString = "8fbtEjMo7IMQt1vNuVEgENBjZXvxVMjCBfZvlwWVQlIb9qj1yq8ciqmoTLbvxgCj/FrzAnQIwiVXZi170Rh7mnZtFmYNqKck0Y2K4sp0pvgxCFzw4wxqpbro/wgrqjDt7N3gIS+aHsJBw/U\n" +
+                "O1CQaQGQJPVoEKohmiKl84sRLXqtjPJycNon4VydOVFBlwjSRTmWTO2jqXApaNfsg2vALdtoLe/b65q6P1TPGCUpJrpM=";
 
         // 解密data
         byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes());