autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +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

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);
}
// 组装结果集