diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index 045902ec2..6b1c2f252 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -18,7 +17,6 @@ import com.jsowell.adapay.vo.PaymentInfo; import com.jsowell.common.YouDianUtils; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.constant.Constants; -import com.jsowell.common.constant.mq.ThirdPartyRabbitConstants; import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; import com.jsowell.common.core.domain.ykc.TransactionRecordsData; @@ -52,8 +50,8 @@ import com.jsowell.pile.vo.base.OrderAmountDetailVO; import com.jsowell.pile.vo.base.OrderPeriodAmountVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.StationInfoVO; -import com.jsowell.pile.vo.uniapp.customer.InvoiceRecordVO; import com.jsowell.pile.vo.uniapp.customer.*; +import com.jsowell.pile.vo.uniapp.customer.InvoiceRecordVO; import com.jsowell.pile.vo.web.*; import com.jsowell.thirdparty.common.CommonService; import com.jsowell.wxpay.response.WechatPayNotifyParameter; @@ -788,20 +786,15 @@ public class OrderService { return false; } - LocalDateTime localDateTime = DateUtils.date2LocalDateTime(settlementTime != null ? settlementTime : chargeEndTime); + // LocalDateTime localDateTime = DateUtils.date2LocalDateTime(settlementTime != null ? settlementTime : chargeEndTime); // 开始时间为localDateTime减30秒 - LocalDateTime startTime = localDateTime.minusSeconds(30); + // LocalDateTime startTime = localDateTime.minusSeconds(30); // 结束时间为localDateTime加30秒 - LocalDateTime endTime = localDateTime.plusSeconds(30); + // LocalDateTime endTime = localDateTime.plusSeconds(30); // 查询这笔订单的交易记录原始数据 - List pileFeedListV2 = pileMsgRecordService.getPileFeedListV2(orderBasicInfo.getPileSn(), "0x3B", startTime, endTime); - // if (CollectionUtils.isEmpty(pileFeedListV2)) { - // // 如果没有交易记录原始数据,则使用停止充电时间作为开始时间和结束时间再查一次 - // localDateTime = DateUtils.date2LocalDateTime(chargeEndTime); - // startTime = localDateTime.minusSeconds(30); - // endTime = localDateTime.plusSeconds(30); - // pileFeedListV2 = pileMsgRecordService.getPileFeedListV2(orderBasicInfo.getPileSn(), "0x3B", startTime, endTime); - // } + // List pileFeedListV2 = pileMsgRecordService.getPileFeedListV2(orderBasicInfo.getPileSn(), "0x3B", startTime, endTime); + List pileFeedListV2 = pileMsgRecordService.queryPileFeedList(orderBasicInfo.getPileSn(), "0x3B", orderBasicInfo.getTransactionCode()); + for (PileMsgRecord pileMsgRecord : pileFeedListV2) { TransactionRecordsData parse = JSONObject.parseObject(pileMsgRecord.getJsonMsg(), TransactionRecordsData.class); if (StringUtils.equals(parse.getTransactionCode(), orderBasicInfo.getTransactionCode())) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMsgRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMsgRecordService.java index 2bbc001b2..401e2bf12 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMsgRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileMsgRecordService.java @@ -35,4 +35,6 @@ public interface PileMsgRecordService { List getPileFeedListV2(String pileSn, String frameType, Date startTime, Date endTime); List getPileFeedListV2(String pileSn, String frameType, LocalDateTime startTime, LocalDateTime endTime); + + List queryPileFeedList(String pileSn, String frameType, String transactionCode); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java index 86662b043..698fd513f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMsgRecordServiceImpl.java @@ -173,6 +173,7 @@ public class PileMsgRecordServiceImpl implements PileMsgRecordService { return this.getPileFeedListV2(pileSn, frameType, DateUtils.localDateTime2Date(startTime), DateUtils.localDateTime2Date(endTime)); } + @Override public List queryPileFeedList(String pileSn, String frameType, String transactionCode) { return pileMsgRecordMapper.queryPileFeedList(pileSn, frameType, transactionCode); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMsgRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMsgRecordMapper.xml index bf1689d38..af8ede6b2 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMsgRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMsgRecordMapper.xml @@ -162,7 +162,7 @@ and frame_type = #{frameType,jdbcType=VARCHAR} - and transaction_code = #{transactionCode,jdbcType=VARCHAR} + and json_msg->>'$.transactionCode' LIKE CONCAT('%', #{transactionCode}, '%')