diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java index e0969f4ce..2f5d0683b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java @@ -7,7 +7,6 @@ import com.jsowell.adapay.service.AdapayService; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; -import com.jsowell.common.core.domain.ykc.TransactionRecordsData; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; @@ -750,17 +749,15 @@ public class TempController extends BaseController { * 调试结算订单逻辑 * http://localhost:8080/temp/testSettleOrderLogic */ - @PostMapping("/testSettleOrderLogic") - public RestApiResponse testSettleOrderLogic(@RequestBody TransactionRecordsData data) { + @PostMapping("/testSettleOrderLogicV2") + public RestApiResponse testSettleOrderLogicV2(@RequestBody QueryOrderDTO dto) { RestApiResponse response; try { - String transactionCode = data.getTransactionCode(); - OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); // 调试结算订单逻辑 - tempService.testSettleOrderLogic(data, orderBasicInfo); + tempService.testSettleOrderLogicV2(dto.getOrderCode()); response = new RestApiResponse<>(); } catch (Exception e) { - logger.error("调试结算订单逻辑error,", e); + logger.error("调试结算订单逻辑V2error,", e); response = new RestApiResponse<>(); } return response; @@ -770,12 +767,12 @@ public class TempController extends BaseController { * 调试结算订单逻辑 * http://localhost:8080/temp/testSettleOrderLogic */ - @PostMapping("/testSettleOrderLogicV2") - public RestApiResponse testSettleOrderLogicV2(@RequestBody QueryOrderDTO dto) { + @PostMapping("/testSettleOrderLogicNotDelay") + public RestApiResponse testSettleOrderLogicNotDelay(@RequestBody QueryOrderDTO dto) { RestApiResponse response; try { // 调试结算订单逻辑 - tempService.testSettleOrderLogicV2(dto.getOrderCode()); + tempService.testSettleOrderLogicNotDelay(dto.getOrderCode()); response = new RestApiResponse<>(); } catch (Exception e) { logger.error("调试结算订单逻辑V2error,", e); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index bdec7122d..40689fd1a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -960,5 +960,34 @@ public class TempService { rabbitTemplate.convertAndSend(RabbitConstants.YKC_EXCHANGE_NAME, RabbitConstants.QUEUE_CHARGE_ORDER_DATA, afterSettleOrderDTO); } + public void testSettleOrderLogicNotDelay(String orderCode) { + // 查询订单主表 + OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode); + + LocalDateTime localDateTime = DateUtils.date2LocalDateTime(orderBasicInfo.getSettlementTime()); + // 开始时间为localDateTime减30秒 + LocalDateTime startTime = localDateTime.minusSeconds(30); + // 结束时间为localDateTime加30秒 + LocalDateTime endTime = localDateTime.plusSeconds(30); + // logger.info("testSettleOrderLogicV2, orderCode:{}, settlementTime:{}, startTime:{}, endTime:{}", orderCode, orderBasicInfo.getSettlementTime(), startTime, endTime); + // logger.info("转换为Date类型, settlementTime:{}, startTime:{}, endTime:{}", orderBasicInfo.getSettlementTime(), DateUtils.localDateTime2Date(startTime), DateUtils.localDateTime2Date(endTime)); + // 查询这笔订单的交易记录原始数据 + List pileFeedListV2 = pileMsgRecordService.getPileFeedListV2(orderBasicInfo.getPileSn(), "0x3B", startTime, endTime); + // logger.info("testSettleOrderLogicV2, orderCode:{}, pileSn:{}, startTime:{}, endTime:{}, pileFeedListV2:{}", + // orderCode, orderBasicInfo.getPileSn(), startTime, endTime, JSON.toJSONString(pileFeedListV2)); + TransactionRecordsData data = null; + for (PileMsgRecord pileMsgRecord : pileFeedListV2) { + TransactionRecordsData parse = JSONObject.parseObject(pileMsgRecord.getJsonMsg(), TransactionRecordsData.class); + if (StringUtils.equals(parse.getTransactionCode(), orderBasicInfo.getTransactionCode())) { + data = parse; + } + } + + logger.info("testSettleOrderLogicNotDelay, orderCode:{}, data:{}", orderCode, JSON.toJSONString(data)); + if (data != null) { + AbstractProgramLogic programLogic = ProgramLogicFactory.getProgramLogic("1"); + programLogic.settleOrder(data, orderBasicInfo); + } + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java index 11cd35d7d..ffaba7140 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java @@ -416,8 +416,6 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { // 从redis中取出实时记录保存到表中 realTimeMonitorDataRedis2DB(orderBasicInfo.getTransactionCode(), orderBasicInfo.getOrderCode()); - // TODO 如果该站点的停车场优惠券信息配置不为空,则需绑定一张优惠券 - logger.info("结算订单end:{} OrderTransactionDTO:{}", orderBasicInfo.getOrderCode(), JSON.toJSONString(dto)); }