autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-12 11:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-04-01 15:33:44 +08:00
parent eaf35ce6e7 a2219f8601
commit 3436d1d670
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
View File

@@ -8,6 +8,7 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.core.redis.RedisCache;
import com.jsowell.common.enums.ykc.OrderStatusEnum; import com.jsowell.common.enums.ykc.OrderStatusEnum;
import com.jsowell.common.enums.ykc.StartModeEnum;
import com.jsowell.common.enums.ykc.YKCChargingStopReasonEnum; import com.jsowell.common.enums.ykc.YKCChargingStopReasonEnum;
import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil; import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil;
@@ -546,6 +547,10 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
orderBasicInfo.setChargeEndTime(DateUtils.parseDate(data.getEndTime())); orderBasicInfo.setChargeEndTime(DateUtils.parseDate(data.getEndTime()));
} }
if (!StringUtils.equals("0000000000000000", data.getLogicCard())) { if (!StringUtils.equals("0000000000000000", data.getLogicCard())) {
// 将此订单启动方式改为卡启动
orderBasicInfo.setStartMode(StartModeEnum.CARD.getValue());
// 将卡号存入订单表
orderBasicInfo.setLogicCard(data.getLogicCard());
// 根据物理卡号查出所属用户 // 根据物理卡号查出所属用户
PileAuthCard cardInfo = pileAuthCardService.selectCardInfoByLogicCard(data.getLogicCard()); PileAuthCard cardInfo = pileAuthCardService.selectCardInfoByLogicCard(data.getLogicCard());
if (cardInfo != null) { if (cardInfo != null) {