autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-05 18:40:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 修改vin码相关代码逻辑

Browse Source
This commit is contained in:
Lemon
2023-06-09 18:44:06 +08:00
parent 3c4052ea91
commit cce23a34c5
6 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java
View File

@@ -13,9 +13,11 @@ import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.domain.PileAuthCard;
import com.jsowell.pile.dto.GenerateOrderDTO;
import com.jsowell.pile.service.ICarVinInfoService;
import com.jsowell.pile.service.IMemberPlateNumberRelationService;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.IPileAuthCardService;
import com.jsowell.pile.vo.CarVinInfoVO;
@@ -47,6 +49,9 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{
@Autowired
private ICarVinInfoService carVinInfoService;
@Autowired
private IMemberPlateNumberRelationService memberPlateNumberRelationService;
@Override
public void afterPropertiesSet() throws Exception {
YKCOperateFactory.register(type, this);
@@ -154,17 +159,17 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{
*/
if (StringUtils.equals("03", startMode)) {
// 通过vin码查询数据库绑定用户信息
CarVinInfoVO memberInfo = carVinInfoService.getMemberInfoByVinCode(vinCode);
if (memberInfo == null) {
MemberPlateNumberRelation plateInfo = memberPlateNumberRelationService.getMemberPlateInfoByVinCode(vinCode);
if (plateInfo == null) {
throw new BusinessException("", "");
}
if (!StringUtils.equals("1", memberInfo.getStatus())) {
if (!StringUtils.equals("1", plateInfo.getVinStatus())) {
// 1- 正常使用
throw new BusinessException("", "");
}
// vin码生成订单 vin启动充电
GenerateOrderDTO dto = new GenerateOrderDTO();
dto.setCarVinInfoVO(memberInfo);
dto.setMemberPlateNumberRelation(plateInfo);
dto.setPileSn(pileSn);
dto.setConnectorCode(connectorCode);
dto.setStartMode(StartModeEnum.VIN_CODE.getValue());

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

@@ -72,7 +72,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
private IStationSettingRelationService stationSettingRelationService;
@Autowired
private ICarVinInfoService carVinInfoService;
private IMemberPlateNumberRelationService memberPlateNumberRelationService;
public static void main(String[] args) {
// 获取消息体
@@ -612,10 +612,10 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
}
// 如果是vin启动，将启动锁定状态改为正常
if (StringUtils.equals(data.getTransactionIdentifier(), "05")) {
CarVinInfo carVinInfo = carVinInfoService.selectVinInfoByVin(data.getVinCode());
if (carVinInfo != null && (StringUtils.equals(carVinInfo.getStatus(), "2"))) {
carVinInfo.setStatus("1");
carVinInfoService.updateCarVinInfo(carVinInfo);
MemberPlateNumberRelation plateInfo = memberPlateNumberRelationService.getMemberPlateInfoByVinCode(data.getVinCode());
if (plateInfo != null && (StringUtils.equals(plateInfo.getVinStatus(), "1"))) {
plateInfo.setVinStatus("0");
memberPlateNumberRelationService.updateMemberPlateNumberRelation(plateInfo);
}
}
orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo);

3
jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.pile.dto;
import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.domain.PileAuthCard;
import com.jsowell.pile.vo.CarVinInfoVO;
import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO;
@@ -71,5 +72,5 @@ public class GenerateOrderDTO extends BasicPileDTO{
/**
* vin启动有值
*/
private CarVinInfoVO carVinInfoVO;
private MemberPlateNumberRelation MemberPlateNumberRelation;
}

7
jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java
View File

@@ -78,4 +78,11 @@ public interface IMemberPlateNumberRelationService
* @return
*/
int unbindingPlateNumber(String memberId, String plateNumber);
/**
* 通过vin码查询信息
* @param vinCode
* @return
*/
MemberPlateNumberRelation getMemberPlateInfoByVinCode(String vinCode);
}

10
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java
View File

@@ -112,4 +112,14 @@ public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberR
public int unbindingPlateNumber(String memberId, String plateNumber) {
return memberPlateNumberRelationMapper.unbindingPlateNumber(memberId, plateNumber);
}
/**
* 通过vin码查询信息
* @param vinCode
* @return
*/
@Override
public MemberPlateNumberRelation getMemberPlateInfoByVinCode(String vinCode) {
return memberPlateNumberRelationMapper.getMemberPlateInfoByVinCode(vinCode);
}
}

18
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -135,7 +135,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
private IPileMerchantInfoService pileMerchantInfoService;
@Autowired
private ICarVinInfoService carVinInfoService;
private IMemberPlateNumberRelationService memberPlateNumberRelationService;
@Value("${adapay.refundCallback}")
private String ADAPAY_REFUND_CALLBACK_URL;
@@ -1557,7 +1557,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
String memberId = "";
String vinCode = "";
PileAuthCard pileAuthCardInfo = new PileAuthCard();
CarVinInfoVO carVinInfoVO = new CarVinInfoVO();
// CarVinInfoVO carVinInfoVO = new CarVinInfoVO();
MemberPlateNumberRelation relation = new MemberPlateNumberRelation();
if (StringUtils.equals(StartModeEnum.AUTH_CARD.getValue(), startMode)) {
// 刷卡启动充电
pileAuthCardInfo = dto.getPileAuthCardInfo();
@@ -1565,9 +1566,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
logicCard = pileAuthCardInfo.getLogicCard();
}else if (StringUtils.equals(StartModeEnum.VIN_CODE.getValue(), startMode)) {
// vin启动充电
carVinInfoVO = dto.getCarVinInfoVO();
memberId = carVinInfoVO.getMemberId();
vinCode = carVinInfoVO.getVinCode();
relation = dto.getMemberPlateNumberRelation();
memberId = relation.getMemberId();
vinCode = relation.getVinCode();
}
// 通过memberId获取账户余额
MemberVO memberVO = memberBasicInfoService.queryMemberInfoByMemberId(memberId);
@@ -1640,11 +1641,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
pileAuthCardService.updatePileAuthCard(pileAuthCard);
} else if (StringUtils.equals(StartModeEnum.VIN_CODE.getValue(), startMode)) {
// 将vin码改成启动锁定
CarVinInfo carVinInfo = new CarVinInfo();
carVinInfo.setId(Long.parseLong(carVinInfoVO.getId()));
carVinInfo.setVinCode(carVinInfoVO.getVinCode());
carVinInfo.setStatus("2");
carVinInfoService.updateCarVinInfo(carVinInfo);
relation.setVinStatus("1");
memberPlateNumberRelationService.updateMemberPlateNumberRelation(relation);
}
// 组装结果集