diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index 14c99bec8..52f2932ae 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -7,7 +7,6 @@ import com.jsowell.common.core.domain.ykc.TransactionRecordsData; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.core.redis.RedisCache; -import com.jsowell.common.enums.ykc.CardStatusEnum; import com.jsowell.common.enums.ykc.OrderStatusEnum; import com.jsowell.common.enums.ykc.YKCChargingStopReasonEnum; import com.jsowell.common.util.BytesUtil; @@ -17,7 +16,8 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.pile.domain.*; +import com.jsowell.pile.domain.OrderBasicInfo; +import com.jsowell.pile.domain.ThirdPartyStationRelation; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.thirdparty.lianlian.service.LianLianService; @@ -604,24 +604,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { if (Objects.isNull(orderBasicInfo.getChargeEndTime())) { // 结束时间 orderBasicInfo.setChargeEndTime(DateUtils.parseDate(data.getEndTime())); } - // if (!StringUtils.equals("0000000000000000", data.getLogicCard())) { - // // 根据物理卡号查出当前为锁定状态的卡 - // PileAuthCard cardInfo = pileAuthCardService.selectSomeStatusCardInfo(CardStatusEnum.START_LOCK.getCode(), orderBasicInfo.getLogicCard()); - // if (cardInfo != null) { - // // orderBasicInfo.setMemberId(cardInfo.getMemberId()); - // // 将此卡状态改为正常 - // cardInfo.setStatus(CardStatusEnum.NORMAL.getCode()); - // pileAuthCardService.updatePileAuthCard(cardInfo); - // } - // } - // // 如果是vin启动,将启动锁定状态改为正常 - // if (StringUtils.equals(data.getTransactionIdentifier(), "05")) { - // MemberPlateNumberRelation plateInfo = memberPlateNumberRelationService.getMemberPlateInfoByVinCode(data.getVinCode()); - // if (plateInfo != null && (StringUtils.equals(plateInfo.getVinStatus(), "2"))) { - // plateInfo.setVinStatus("1"); - // memberPlateNumberRelationService.updateMemberPlateNumberRelation(plateInfo); - // } - // } + orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo); // 结算订单操作