Merge branch 'master' of http://47.92.161.104:10080/fulonglong/chargeing-parking

src/main/java/com/charging/chargingparking/scheduled/ChannelStatusTask.java

@@ -1,5 +1,6 @@
 package com.charging.chargingparking.scheduled;
 
+import cn.hutool.core.util.StrUtil;
 import com.charging.chargingparking.entity.ParkingChannel;
 import com.charging.chargingparking.service.ParkingChannelService;
 import lombok.extern.slf4j.Slf4j;
@@ -36,11 +37,13 @@ public class ChannelStatusTask {
                     Object channelTime = valueOperations.get(parkingChannel.getChannelCode());
                     if (channelTime == null){
                         if ("1".equals(parkingChannel.getChannelStatus())){
+                            log.error(StrUtil.format("道闸掉线:{}",parkingChannel.getChannelName()));
                             parkingChannel.setChannelStatus("2");
                             parkingChannelService.updateById(parkingChannel);
                         }
                     }else {
                         if ("2".equals(parkingChannel.getChannelStatus())){
+                            log.warn(StrUtil.format("道闸上线：{}",parkingChannel.getChannelName()));
                             parkingChannel.setChannelStatus("1");
                             parkingChannelService.updateById(parkingChannel);
                         }

src/main/java/com/charging/chargingparking/service/impl/ParkingChannelServiceImpl.java

@@ -126,13 +126,14 @@ public class ParkingChannelServiceImpl extends ServiceImpl<ParkingChannelMapper,
             param.put("pay_status",20);
             ParkingPay parkingPay = parkingPayService.findOneByParam(param);
             if (parkingPay != null) {
+                log.warn(StrUtil.format("道闸：{}，查询到支付开门信息，停车记录id：{}",parkingChannel.getChannelName(),parkingPay.getParkingRecordId()));
                 ParkingRecord parkingRecord = parkingRecordService.getById(parkingPay.getParkingRecordId());
                 //获取此停车场记录应缴费用
             //    ParkingCostDTO parkingCostDTO = parkingFeeService.parkingCost2(parkingRecord);
             //    BigDecimal parkCost = parkingCostDTO.getNeedAmount();
                 BigDecimal parkCost = BigDecimal.ZERO;
                 //如果应缴费用和已缴费用相同则开闸
-                if (parkCost.compareTo(parkingRecord.getPayAmount()) == 0) {
+                if (parkingRecord.getTotalAmount().compareTo(parkingRecord.getPayAmount()) == 0) {
                     parkingRecord.setReleaseStatus("1");
                     parkingRecord.setOutParkingTime(new Date());
                     parkingRecordService.updateById(parkingRecord);