qiubinghui
/
zhywpt-issuer
Observar 1
Favorito 0
Fork 0
Código Issues 0 Pull requests 0 Versões 0 Wiki Atividade
Ver código fonte

ias审核调整

master
chenchaod 16 horas atrás
pai
847a9fe22b
commit
d17208443b
4 arquivos alterados com 221 adições e 203 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 34
    22
      zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/AssOrderAuditManager.java
  2. 103
    98
      zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/releasePlate/ReleasePlateReviewManager.java
  3. 1
    1
      zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/signChange/SignChangeCollectManager.java
  4. 83
    82
      zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/vehicleChange/VehicleChangeReviewManagew.java

+ 34
- 22
zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/AssOrderAuditManager.java Ver arquivo

@@ -79,8 +79,13 @@ public class AssOrderAuditManager extends AbstractAssManager<AssOrderAuditReques
AssOrderinfo order = (AssOrderinfo) dataStream.get(ORDER);
event.setType(order.getOrderType().name());//售后订单类型，用于记录接口日志
Staff staff = (Staff) dataStream.get(STAFF);
if (request.getAuditStatus()) {
//审核通过

order.setAuditOpenId(staff.getOpenId());
order.setAuditTime(LocalDateTime.now());
order.setUpdateTime(LocalDateTime.now());
order.setArtificialStatus(1);

// if (request.getAuditStatus()) {
switch (order.getOrderType()) {
case USER_UPDATE:
customerInfoChangeAuditManager.serviceHandle(request, order, staff);
@@ -89,7 +94,7 @@ public class AssOrderAuditManager extends AbstractAssManager<AssOrderAuditReques
releasePlateReviewManager.serviceHandle(request, order, staff);
break;
case VEHICLE_UPDATE://车辆信息变更
vehicleChangeReviewManagew.serviceHandle(request, order, staff,request.getSourceIn(),dataStream);
vehicleChangeReviewManagew.serviceHandle(request, order, staff,dataStream);
break;
case DEVICE_RESUME:
deviceResumeManager.serviceHandle(request, order, staff);
@@ -101,30 +106,37 @@ public class AssOrderAuditManager extends AbstractAssManager<AssOrderAuditReques
obuSupplyReviewManager.serviceHandle(request, order, staff);
break;
case PLATE_INFO_CHANGE://签约信息变更
order.setOrderStep(AssOrderStep.WAITING_PAY);
break;
//TODO
default:
throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("订单类型未定义");
}
} else {
switch (order.getOrderType()) {
case CANCEL:

if (request.getAuditStatus()){
order.setOrderStep(AssOrderStep.WAITING_PAY);
}else {
order.setAuditFailureCase(request.getReason());
order.setOrderStatus(AssOrderStatus.CLOSE);
order.setOrderStep(AssOrderStep.AUDIT_FAIL);
}
orderInfoRepo.merge(order);
break;
//TODO
default:
throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("订单类型未定义");
}
order.setAuditFailureCase(request.getReason());
order.setOrderStatus(AssOrderStatus.CLOSE);
order.setOrderStep(AssOrderStep.AUDIT_FAIL);
}
order.setAuditOpenId(staff.getOpenId());
order.setAuditTime(LocalDateTime.now());
order.setUpdateTime(LocalDateTime.now());
order.setArtificialStatus(1);
orderInfoRepo.merge(order);
// } else {
// switch (order.getOrderType()) {
// case CANCEL:
//
// break;
// //TODO
// default:
// throw GlyServiceError.FORMAT_VALIDATE_ERR.toHandleException("订单类型未定义");
// }
// order.setAuditFailureCase(request.getReason());
// order.setOrderStatus(AssOrderStatus.CLOSE);
// order.setOrderStep(AssOrderStep.AUDIT_FAIL);
// }
// order.setAuditOpenId(staff.getOpenId());
// order.setAuditTime(LocalDateTime.now());
// order.setUpdateTime(LocalDateTime.now());
// order.setArtificialStatus(1);
// orderInfoRepo.merge(order);
dataStream.put(ORDER, order);
}


+ 103
- 98
zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/releasePlate/ReleasePlateReviewManager.java Ver arquivo

@@ -19,6 +19,7 @@ import cn.com.taiji.core.entity.user.Staff;
import cn.com.taiji.core.model.comm.protocol.ias.ass.AssOrderAuditRequest;
import cn.com.taiji.core.model.comm.protocol.ias.ygz.*;
import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
import cn.com.taiji.core.repo.jpa.ass.AssVehicleRelieveRepo;
import cn.com.taiji.core.repo.jpa.basic.QtkBlackCardRepo;
import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
@@ -61,14 +62,23 @@ public class ReleasePlateReviewManager extends AssCommonUtil {
private YgzCardBlackUploadManager cardBlackUploadManager;
@Autowired
private YgzObuUploadManager ygzObuUploadManager;
@Autowired
protected AssOrderinfoRepo orderInfoRepo;


public void serviceHandle(AssOrderAuditRequest req,AssOrderinfo orderInfo,Staff staff) throws ServiceHandleException {
Map<String, Object> dataStream = Maps.newHashMap();
//业务校验
businessValidateInternal(req,dataStream);
//处理业务
persistInternal(req,orderInfo,staff,dataStream);
if (req.getAuditStatus()){
Map<String, Object> dataStream = Maps.newHashMap();
//业务校验
businessValidateInternal(req,dataStream);
//处理业务
persistInternal(req,orderInfo,staff,dataStream);
}else {
orderInfo.setAuditFailureCase(req.getReason());
orderInfo.setOrderStatus(AssOrderStatus.CLOSE);
orderInfo.setOrderStep(AssOrderStep.AUDIT_FAIL);
}
orderInfoRepo.merge(orderInfo);

}

@@ -76,29 +86,27 @@ public class ReleasePlateReviewManager extends AssCommonUtil {

AssVehicleRelieve vehicleRelieve = assVehicleRelieveRepo.findByOrderNo(req.getOrderNo());

if (req.getAuditStatus()) {
// todo 存在欠费不可审核通过
//有在用卡->进行卡校验
if (hasText(vehicleRelieve.getRelieveCardId())) {
//双系统查询卡
QtkCardInfo card = queryCard(vehicleRelieve.getRelieveCardId());
if (card.getCardTypeNew() == CardType.PRE_CHARGE_CARD)
throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该卡为预存卡！");
//双系统查询黑名单
List<QtkBlackCard> qtkBlackCards = queryBlackCard(vehicleRelieve.getRelieveCardId());
List<CardBlackType> cardType = qtkBlackCards.stream().map(QtkBlackCard::getType).collect(Collectors.toList());
if (cardType.contains(CardBlackType.VEHICLE_TYPE_NOTMATCH))
throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("不可审核通过-该卡为车型不符类型黑名单，不能挂起");
if (cardType.contains(CardBlackType.AGENCY_BLACK))
throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("不可审核通过-该卡为合作机构黑名单，不能挂起");
if (cardType.contains(CardBlackType.OVERDRAW))
throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("不可审核通过-该卡为账户透支类型黑名单，不能挂起");
}
//有在用签->进行签校验
// todo 存在欠费不可审核通过
//有在用卡->进行卡校验
if (hasText(vehicleRelieve.getRelieveCardId())) {
//双系统查询卡
QtkCardInfo card = queryCard(vehicleRelieve.getRelieveCardId());
if (card.getCardTypeNew() == CardType.PRE_CHARGE_CARD)
throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该卡为预存卡！");
//双系统查询黑名单
List<QtkBlackCard> qtkBlackCards = queryBlackCard(vehicleRelieve.getRelieveCardId());
List<CardBlackType> cardType = qtkBlackCards.stream().map(QtkBlackCard::getType).collect(Collectors.toList());
if (cardType.contains(CardBlackType.VEHICLE_TYPE_NOTMATCH))
throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("不可审核通过-该卡为车型不符类型黑名单，不能挂起");
if (cardType.contains(CardBlackType.AGENCY_BLACK))
throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("不可审核通过-该卡为合作机构黑名单，不能挂起");
if (cardType.contains(CardBlackType.OVERDRAW))
throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("不可审核通过-该卡为账户透支类型黑名单，不能挂起");
}
//有在用签->进行签校验
// if (hasText(vehicleRelieve.getRelieveObuId())) {
// //到这一步就不需要校验了，如果有，签状态只会是1、6、11
// }
}

dataStream.put(RELEASE_PL, vehicleRelieve);
}
@@ -106,82 +114,79 @@ public class ReleasePlateReviewManager extends AssCommonUtil {
protected void persistInternal(AssOrderAuditRequest req,AssOrderinfo orderInfo, Staff staff, Map<String, Object> dataStream) throws ServiceHandleException {
AssVehicleRelieve vehicleRelieve = (AssVehicleRelieve) dataStream.get(RELEASE_PL);
LocalDateTime now = LocalDateTime.now();
if (req.getAuditStatus()){
orderInfo.setOrderStep(AssOrderStep.COMPLETED);
orderInfo.setOrderStatus(AssOrderStatus.FINISHED);
//下黑-挂起卡
if (hasText(vehicleRelieve.getRelieveCardId())){
//双系统查询卡
QtkCardInfo qtkCardInfo = queryCard(vehicleRelieve.getRelieveCardId());
//=====================================================卡黑名单开始================================================
//在用卡不会存在挂起的黑名单，直接插入
//本地插入卡黑名单表
QtkBlackCard qtkBlackCard = new QtkBlackCard();
qtkBlackCard.setCardId(vehicleRelieve.getRelieveCardId());
qtkBlackCard.setCreateTime(now);
qtkBlackCard.setCreationTime(now);
qtkBlackCard.setIssuerId(DsiConstant.GUIZHOU_ISSUERID);
qtkBlackCard.setStatus(DsiConstant.BLACKLIST_UPLOAD);
qtkBlackCard.setType(CardBlackType.HANG_WITHOUT_CARD);
qtkBlackCard.setStaffId(staff.getStaffId());
qtkBlackCard.setReason("解除车牌占用-下黑挂起");
qtkBlackCard.setSourceIn(req.getSourceIn());
//黑名单上传营改增-部中心
YgzCardBlackUploadRequest ygzCardBlackUploadRequest = new YgzCardBlackUploadRequest();
ygzCardBlackUploadRequest.setStatus(DsiConstant.BLACKLIST_UPLOAD);
ygzCardBlackUploadRequest.setCardId(qtkCardInfo.getCardId());
ygzCardBlackUploadRequest.setBlackType(CardBlackType.HANG_WITHOUT_CARD.getCode());
ygzCardBlackUploadRequest.setDataSource(DataSourceEnum.DSI_INTERFACE);
ygzCardBlackUploadRequest.setCreationTime(now);
YgzCardBlackUploadResponse ygzCardBlackUploadResponse = cardBlackUploadManager.serviceHandle(ygzCardBlackUploadRequest);
if (ygzCardBlackUploadResponse == null || ygzCardBlackUploadResponse.isSuccess()) {
throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("营改增数据同步失败");
}
//=====================================================卡黑名单结束================================================

//=====================================================卡信息开始==================================================
//本地卡状态变更
qtkCardInfo.setCardStatus(CardStatus.WKGQ);
qtkCardInfo.setCardStatusChangeTime(now);
qtkCardInfo.setUpdateTime(now);
qtkCardInfo.setVehicleId(null);
//卡上传营改增、部中心
YgzCardUploadRequest ygzCardUploadRequest = new YgzCardUploadRequest();
ygzCardUploadRequest.setCard(qtkCardInfo);
ygzCardUploadRequest.setOperation(Operation.UPDATE);
ygzCardUploadRequest.setDataSource(DataSourceEnum.DSI_INTERFACE);
ygzCardUploadManager.serviceHandle(ygzCardUploadRequest);
//=====================================================卡信息结束==================================================

// 同步老库事务-卡黑名单信息
qtkBlackCardRepo.persist(qtkBlackCard);
transactionManager.persistTransaction(TransactionBizType.BLACK_CARD_DELETESYNC, qtkBlackCard.getId(), "解除车牌占用-下黑挂起卡-qtkBlackCard表");
// 同步老库事务-卡信息
qtkCardInfoRepo.save(qtkCardInfo);
transactionManager.persistTransaction(TransactionBizType.ISSUE_CARD_SYNC, qtkCardInfo.getCardId(), "解除车牌占用-下黑挂起卡-cardInfo表");
}

//下黑-挂起签
if (hasText(vehicleRelieve.getRelieveObuId())){
//双系统查询签
QtkObuInfo qtkObuInfo = queryObu(vehicleRelieve.getRelieveObuId());
qtkObuInfo.setObuStatus(ObuStatus.WQGQ);
qtkObuInfo.setObuStatusChangeTime(now);
qtkObuInfo.setUpdateTime(now);
qtkObuInfo.setVehicleId(null);
//上传营改增、上传部中心
YgzObuUploadRequest ygzObuUploadRequest = new YgzObuUploadRequest();
ygzObuUploadRequest.setObu(qtkObuInfo);
ygzObuUploadRequest.setOperation(Operation.UPDATE);
ygzObuUploadRequest.setDataSource(DataSourceEnum.DSI_INTERFACE);
ygzObuUploadManager.serviceHandle(ygzObuUploadRequest);
//本地保存更新
qtkObuInfoRepo.save(qtkObuInfo);
transactionManager.persistTransaction(TransactionBizType.ISSUE_OBU_SYNC, qtkObuInfo.getCardId(), "解除车牌占用-下黑挂起签-obuInfo表");
orderInfo.setOrderStep(AssOrderStep.COMPLETED);
orderInfo.setOrderStatus(AssOrderStatus.FINISHED);
//下黑-挂起卡
if (hasText(vehicleRelieve.getRelieveCardId())){
//双系统查询卡
QtkCardInfo qtkCardInfo = queryCard(vehicleRelieve.getRelieveCardId());
//=====================================================卡黑名单开始================================================
//在用卡不会存在挂起的黑名单，直接插入
//本地插入卡黑名单表
QtkBlackCard qtkBlackCard = new QtkBlackCard();
qtkBlackCard.setCardId(vehicleRelieve.getRelieveCardId());
qtkBlackCard.setCreateTime(now);
qtkBlackCard.setCreationTime(now);
qtkBlackCard.setIssuerId(DsiConstant.GUIZHOU_ISSUERID);
qtkBlackCard.setStatus(DsiConstant.BLACKLIST_UPLOAD);
qtkBlackCard.setType(CardBlackType.HANG_WITHOUT_CARD);
qtkBlackCard.setStaffId(staff.getStaffId());
qtkBlackCard.setReason("解除车牌占用-下黑挂起");
qtkBlackCard.setSourceIn(req.getSourceIn());
//黑名单上传营改增-部中心
YgzCardBlackUploadRequest ygzCardBlackUploadRequest = new YgzCardBlackUploadRequest();
ygzCardBlackUploadRequest.setStatus(DsiConstant.BLACKLIST_UPLOAD);
ygzCardBlackUploadRequest.setCardId(qtkCardInfo.getCardId());
ygzCardBlackUploadRequest.setBlackType(CardBlackType.HANG_WITHOUT_CARD.getCode());
ygzCardBlackUploadRequest.setDataSource(DataSourceEnum.DSI_INTERFACE);
ygzCardBlackUploadRequest.setCreationTime(now);
YgzCardBlackUploadResponse ygzCardBlackUploadResponse = cardBlackUploadManager.serviceHandle(ygzCardBlackUploadRequest);
if (ygzCardBlackUploadResponse == null || ygzCardBlackUploadResponse.isSuccess()) {
throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("营改增数据同步失败");
}
//=====================================================卡黑名单结束================================================

//=====================================================卡信息开始==================================================
//本地卡状态变更
qtkCardInfo.setCardStatus(CardStatus.WKGQ);
qtkCardInfo.setCardStatusChangeTime(now);
qtkCardInfo.setUpdateTime(now);
qtkCardInfo.setVehicleId(null);
//卡上传营改增、部中心
YgzCardUploadRequest ygzCardUploadRequest = new YgzCardUploadRequest();
ygzCardUploadRequest.setCard(qtkCardInfo);
ygzCardUploadRequest.setOperation(Operation.UPDATE);
ygzCardUploadRequest.setDataSource(DataSourceEnum.DSI_INTERFACE);
ygzCardUploadManager.serviceHandle(ygzCardUploadRequest);
//=====================================================卡信息结束==================================================

// 同步老库事务-卡黑名单信息
qtkBlackCardRepo.persist(qtkBlackCard);
transactionManager.persistTransaction(TransactionBizType.BLACK_CARD_DELETESYNC, qtkBlackCard.getId(), "解除车牌占用-下黑挂起卡-qtkBlackCard表");
// 同步老库事务-卡信息
qtkCardInfoRepo.save(qtkCardInfo);
transactionManager.persistTransaction(TransactionBizType.ISSUE_CARD_SYNC, qtkCardInfo.getCardId(), "解除车牌占用-下黑挂起卡-cardInfo表");
}

//下黑-挂起签
if (hasText(vehicleRelieve.getRelieveObuId())){
//双系统查询签
QtkObuInfo qtkObuInfo = queryObu(vehicleRelieve.getRelieveObuId());
qtkObuInfo.setObuStatus(ObuStatus.WQGQ);
qtkObuInfo.setObuStatusChangeTime(now);
qtkObuInfo.setUpdateTime(now);
qtkObuInfo.setVehicleId(null);
//上传营改增、上传部中心
YgzObuUploadRequest ygzObuUploadRequest = new YgzObuUploadRequest();
ygzObuUploadRequest.setObu(qtkObuInfo);
ygzObuUploadRequest.setOperation(Operation.UPDATE);
ygzObuUploadRequest.setDataSource(DataSourceEnum.DSI_INTERFACE);
ygzObuUploadManager.serviceHandle(ygzObuUploadRequest);
//本地保存更新
qtkObuInfoRepo.save(qtkObuInfo);
transactionManager.persistTransaction(TransactionBizType.ISSUE_OBU_SYNC, qtkObuInfo.getCardId(), "解除车牌占用-下黑挂起签-obuInfo表");
}
//更新售后表
//交给调用者

//更新解除车牌占用明细表
vehicleRelieve.setRelieveTime(now);

+ 1
- 1
zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/signChange/SignChangeCollectManager.java Ver arquivo

@@ -85,7 +85,7 @@ public class SignChangeCollectManager extends AbstractAssManager<SignChangeColle
assSignChange.setVehPosImgUrl(req.getVehPosImgUrl());
assSignChange.setVehNegImgUrl(req.getVehNegImgUrl());
assSignChange.setVehicleName(req.getVehicleName());
assSignChange.setUseUserType(UseUserType.valueOfCode(req.getUseUserType()));
// assSignChange.setUseUserType(UseUserType.valueOfCode(req.getUseUserType()));
assSignChange.setVin(req.getVin());
assSignChange.setEngineNum(req.getEngineNum());
assSignChange.setVehicleType(req.getVehicleType());

+ 83
- 82
zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/vehicleChange/VehicleChangeReviewManagew.java Ver arquivo

@@ -6,6 +6,7 @@ import cn.com.taiji.core.entity.ass.AssDeviceUpgrade;
import cn.com.taiji.core.entity.ass.AssOrderinfo;
import cn.com.taiji.core.entity.ass.AssVehicleInfoChange;
import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
import cn.com.taiji.core.entity.dict.ass.AssOrderType;
import cn.com.taiji.core.entity.dict.basic.*;
@@ -17,6 +18,7 @@ import cn.com.taiji.core.model.comm.protocol.bls.CardInRequest;
import cn.com.taiji.core.model.comm.protocol.ias.ass.AssOrderAuditRequest;
import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
import cn.com.taiji.core.repo.jpa.ass.AssDeviceUpgradeRepo;
import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
import cn.com.taiji.core.repo.jpa.ass.AssVehicleInfoChangeRepo;
import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
import cn.com.taiji.ias.manager.AbstractCommManager;
@@ -42,28 +44,64 @@ public class VehicleChangeReviewManagew extends AbstractCommManager {
private AssDeviceUpgradeRepo assDeviceUpgradeRepo;
@Autowired
private QtkVehicleInfoRepo qtkVehicleInfoRepo;
@Autowired
protected AssOrderinfoRepo orderInfoRepo;

public void serviceHandle(AssOrderAuditRequest request, AssOrderinfo order, Staff staff, Map<String, Object> dataStream) throws ServiceHandleException {

if (request.getAuditStatus()){
tg(request, order, staff, dataStream);
}else {
order.setAuditFailureCase(request.getReason());
order.setOrderStatus(AssOrderStatus.CLOSE);
order.setOrderStep(AssOrderStep.AUDIT_FAIL);
}
orderInfoRepo.merge(order);
}



public void serviceHandle(AssOrderAuditRequest request, AssOrderinfo order, Staff staff, SourceType sourceIn, Map<String, Object> dataStream) throws ServiceHandleException {
public AssOrderChannelNoticeModel notifyChannel(AssOrderinfo assOrderinfo, AssVehicleInfoChange vehicleInfoChange) {
//通知渠道
AssOrderChannelNoticeModel callModel = new AssOrderChannelNoticeModel();
callModel.setOrderNo(assOrderinfo.getOrderNo());
callModel.setOrderType(assOrderinfo.getOrderType().getCode());
callModel.setOrderStatus(assOrderinfo.getOrderStatus().getCode());
callModel.setReason(assOrderinfo.getCancelReason());
if (assOrderinfo.getCancelTime() != null) {
callModel.setCancelTime(assOrderinfo.getCancelTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
}
callModel.setApplyTime(assOrderinfo.getApplyTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
VehicleChangeModel vehicleChangeModel = new VehicleChangeModel();
vehicleChangeModel.setOrderStep(assOrderinfo.getOrderStep().getCode());
vehicleChangeModel.setVehicleId(vehicleInfoChange.getVehiclePlate()+"_"+vehicleInfoChange.getVehiclePlateColor());
vehicleChangeModel.setOldVehicleId(assOrderinfo.getVehicleId());
vehicleChangeModel.setFeeVehicleType(vehicleInfoChange.getType());
vehicleChangeModel.setOldFeeVehicleType(vehicleInfoChange.getOldType());
callModel.setVehicleChangeInfo(vehicleChangeModel);
return callModel;
}

//通过处理
private void tg(AssOrderAuditRequest request, AssOrderinfo order, Staff staff, Map<String, Object> dataStream) throws ServiceHandleException {
AssVehicleInfoChange vehicleInfoChange = assVehicleInfoChangeRepo.findByOrderNo(request.getOrderNo());
Boolean flag = false;//是否需要升级设备
//车牌变更
String newVehicleId = vehicleInfoChange.getVehiclePlate() + "_" + vehicleInfoChange.getVehiclePlateColor();
if (!newVehicleId.equals(order.getVehicleId())) {
//有产品说明渠道不支持更换车牌，重新发行
//车牌变更(只有记账卡，才有支付签约问题)
if (order.getCardType() == CardType.CHARGE_CARD && vehicleInfoChange.getChangeType()) {
//有产品说明渠道不支持更换车牌，选择产品进行支付签约
if (hasText(vehicleInfoChange.getProductId())) {
order.setOrderStep(AssOrderStep.WAITING_PAY);
}else {
//渠道支持车牌发生变化需要重新签约
//渠道支持（包括必须支持，如：储值卡的直接变更）车牌发生变化需要重新签约
order.setOrderStep(AssOrderStep.WAITING_SIGN);
flag = true;
}
}
//车辆信息变更(车型发生变化，需要设备升级，如果需要选择产品重新发行，就没有升级的步骤)
QtkVehicleInfo oldVehicle = qtkVehicleInfoRepo.findByVehicleId(order.getVehicleId());
if (vehicleInfoChange.getProductId() == null && !vehicleInfoChange.getType().equals(oldVehicle.getType())) {
if (!hasText(vehicleInfoChange.getProductId()) && !vehicleInfoChange.getType().equals(oldVehicle.getType())) {
//收费车型发生改变，升级设备
if (!flag) {//如果车牌未发生变化，则阶段是升级设备
if (!flag) {//如果flag 为true 说明前面需要签约，不可再改变订单阶段（升级设备的是交给签约判断），为false则阶段是升级设备
order.setOrderStep(AssOrderStep.WAITING_UPGRADE);
}
flag = true;
@@ -74,7 +112,7 @@ public class VehicleChangeReviewManagew extends AbstractCommManager {
cardInRequest.setType(CardBlackType.VEHICLE_TYPE_NOTMATCH.getCode());
cardInRequest.setCardId(order.getCardId());
cardInRequest.setReason("车辆信息变更审核通过-下黑待升级");
cardInRequest.setSourceIn(sourceIn.name());
cardInRequest.setSourceIn(request.getSourceIn().getName());
cardInRequest.setStaffId(staff.getStaffId());
AbstractBlsResponse abstractBlsResponse = jsonPostRepeat(cardInRequest);
if (abstractBlsResponse.getUploadStatus() != 1) {
@@ -90,28 +128,6 @@ public class VehicleChangeReviewManagew extends AbstractCommManager {
dataStream.put(CAR_CHANGE,vehicleInfoChange);
//公众号通知 todo
}

public AssOrderChannelNoticeModel notifyChannel(AssOrderinfo assOrderinfo, AssVehicleInfoChange vehicleInfoChange) {
//通知渠道
AssOrderChannelNoticeModel callModel = new AssOrderChannelNoticeModel();
callModel.setOrderNo(assOrderinfo.getOrderNo());
callModel.setOrderType(assOrderinfo.getOrderType().getCode());
callModel.setOrderStatus(assOrderinfo.getOrderStatus().getCode());
callModel.setReason(assOrderinfo.getCancelReason());
if (assOrderinfo.getCancelTime() != null) {
callModel.setCancelTime(assOrderinfo.getCancelTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
}
callModel.setApplyTime(assOrderinfo.getApplyTime().format(TimeTools.ISO_LOCAL_DATE_TIME));
VehicleChangeModel vehicleChangeModel = new VehicleChangeModel();
vehicleChangeModel.setOrderStep(assOrderinfo.getOrderStep().getCode());
vehicleChangeModel.setVehicleId(vehicleInfoChange.getVehiclePlate()+"_"+vehicleInfoChange.getVehiclePlateColor());
vehicleChangeModel.setOldVehicleId(assOrderinfo.getVehicleId());
vehicleChangeModel.setFeeVehicleType(vehicleInfoChange.getType());
vehicleChangeModel.setOldFeeVehicleType(vehicleInfoChange.getOldType());
callModel.setVehicleChangeInfo(vehicleChangeModel);
return callModel;
}

//设备需升级写入表
private void inDeviceUpTable(AssOrderinfo order, AssVehicleInfoChange vehicleInfoChange) {
AssDeviceUpgrade deviceUpgrade = new AssDeviceUpgrade();
@@ -129,56 +145,41 @@ public class VehicleChangeReviewManagew extends AbstractCommManager {

//更新车辆信息
private void changeVehicle(QtkVehicleInfo oldVehicle, AssVehicleInfoChange vehicleInfoChange) {
// LocalDateTime now = LocalDateTime.now();
// oldVehicle.setVehicleId(vehicleInfoChange.getVehiclePlate() + "_" + vehicleInfoChange.getVehiclePlateColor());
// oldVehicle.setVehiclePlate(vehicleInfoChange.getVehiclePlate());
// oldVehicle.setVehiclePlateColor(vehicleInfoChange.getVehiclePlateColor());
// oldVehicle.setVehicleType(vehicleInfoChange.getVehicleType());
// oldVehicle.setType(vehicleInfoChange.getType());
// if (vehicleInfoChange.getOwnerIdType() != null){
// //有车主信息存车主信息
// oldVehicle.setOwnerName(vehicleInfoChange.getOwnerName());
// oldVehicle.setOwnerIdType(vehicleInfoChange.getOwnerIdType());
// oldVehicle.setOwnerIdNum(vehicleInfoChange.getOwnerIdNum());
// oldVehicle.setOwnerAddress(vehicleInfoChange.getOwnerIdAddress());
// oldVehicle.setOwnerPosImgUrl(vehicleInfoChange.getOwnerPosImgUrl());
// oldVehicle.setOwnerNegImgUrl(vehicleInfoChange.getOwnerNegImgUrl());
// }else {
// //没有车主信息办理人就是车主
// oldVehicle.setOwnerName(vehicleInfoChange.getUserName());
// oldVehicle.setOwnerIdType(vehicleInfoChange.getUserIdType());
// oldVehicle.setOwnerIdNum(vehicleInfoChange.getUserIdNum());
// oldVehicle.setOwnerAddress(vehicleInfoChange.getUserAdress());
// oldVehicle.setOwnerPosImgUrl(vehicleInfoChange.getUserPosImagesUrl());
// oldVehicle.setOwnerNegImgUrl(vehicleInfoChange.getUserNegImagesUrl());
// }
// oldVehicle.setEmergencyFlag(vehicleInfoChange.getEmergencyFlag());
// oldVehicle.setUpdateTime(now);
// oldVehicle.setRegisteredTime(now);
// oldVehicle.setUseUserType(vehicleInfoChange.getUseUserType());
//// oldVehicle.setVehicleSign(vehicleInfoChange.getVehicleSign());
// oldVehicle.setVin(vehicleInfoChange.getVin());
// oldVehicle.setEngineNum(vehicleInfoChange.getEngineNum());
// oldVehicle.setVehicleModel(vehicleInfoChange.getVehicleModel());
// oldVehicle.setApprovedCount(vehicleInfoChange.getApprovedCount());
// oldVehicle.setTotalMass(vehicleInfoChange.getTotalMass());
// oldVehicle.setMaintenaceMass(vehicleInfoChange.getMaintenaceMass());
// oldVehicle.setPermittedWeight(vehicleInfoChange.getPermittedWeight());
// oldVehicle.setVehicleDimensions(vehicleInfoChange.getVehicleDimensions());
// oldVehicle.setPermittedTowWeight(vehicleInfoChange.getPermittedTowWeight());
// oldVehicle.setAxleCount(vehicleInfoChange.getAxleCount());
// oldVehicle.setIssueDate(vehicleInfoChange.getIssueDate());
// oldVehicle.setVehPosImgUrl(vehicleInfoChange.getVehPosImgUrl());
// oldVehicle.setVehNegImgUrl(vehicleInfoChange.getVehNegImgUrl());
// oldVehicle.setTransportIdNum(vehicleInfoChange.getTransportIdNum());
// oldVehicle.setLicenseIdNum(vehicleInfoChange.getLicenseIdNum());
// oldVehicle.setVehBodyUrl(vehicleInfoChange.getVehBodyUrl());
// oldVehicle.setProxyUrl(vehicleInfoChange.getProxyUrl());
// // 车辆使用性质填充
// oldVehicle.setUseCharacter(vehicleInfoChange.getUseCharacter());
// oldVehicle.setRegisterDate(vehicleInfoChange.getRegisterDate());
// oldVehicle.setTractorSign(vehicleInfoChange.getTractorSign());//不是普通车就是牵引车
// oldVehicle.setRoadTransportPermitPicUrl(vehicleInfoChange.getRoadTransportPermitPicUrl());
// qtkVehicleInfoRepo.merge(oldVehicle);
LocalDateTime now = LocalDateTime.now();
oldVehicle.setVehicleId(vehicleInfoChange.getVehiclePlate() + "_" + vehicleInfoChange.getVehiclePlateColor());
oldVehicle.setVehiclePlate(vehicleInfoChange.getVehiclePlate());
oldVehicle.setVehiclePlateColor(vehicleInfoChange.getVehiclePlateColor());
oldVehicle.setVehicleType(vehicleInfoChange.getVehicleType());
oldVehicle.setType(vehicleInfoChange.getType());


oldVehicle.setEmergencyFlag(vehicleInfoChange.getEmergencyFlag());
oldVehicle.setUpdateTime(now);
oldVehicle.setRegisteredTime(now);
oldVehicle.setUseUserType(vehicleInfoChange.getUseUserType());
// oldVehicle.setVehicleSign(vehicleInfoChange.getVehicleSign());
oldVehicle.setVin(vehicleInfoChange.getVin());
oldVehicle.setEngineNum(vehicleInfoChange.getEngineNum());
oldVehicle.setVehicleModel(vehicleInfoChange.getVehicleModel());
oldVehicle.setApprovedCount(vehicleInfoChange.getApprovedCount());
oldVehicle.setTotalMass(vehicleInfoChange.getTotalMass());
oldVehicle.setMaintenaceMass(vehicleInfoChange.getMaintenaceMass());
oldVehicle.setPermittedWeight(vehicleInfoChange.getPermittedWeight());
oldVehicle.setVehicleDimensions(vehicleInfoChange.getVehicleDimensions());
oldVehicle.setPermittedTowWeight(vehicleInfoChange.getPermittedTowWeight());
oldVehicle.setAxleCount(vehicleInfoChange.getAxleCount());
oldVehicle.setIssueDate(vehicleInfoChange.getIssueDate());
oldVehicle.setVehPosImgUrl(vehicleInfoChange.getVehPosImgUrl());
oldVehicle.setVehNegImgUrl(vehicleInfoChange.getVehNegImgUrl());
oldVehicle.setTransportIdNum(vehicleInfoChange.getTransportIdNum());
oldVehicle.setLicenseIdNum(vehicleInfoChange.getLicenseIdNum());
oldVehicle.setVehBodyUrl(vehicleInfoChange.getVehBodyUrl());

// 车辆使用性质填充
oldVehicle.setUseCharacter(vehicleInfoChange.getUseCharacter());
oldVehicle.setRegisterDate(vehicleInfoChange.getRegisterDate());
oldVehicle.setTractorSign(vehicleInfoChange.getTractorSign());//不是普通车就是牵引车
oldVehicle.setRoadTransportPermitPicUrl(vehicleInfoChange.getRoadTransportPermitPicUrl());
qtkVehicleInfoRepo.merge(oldVehicle);
}
}

Escrever Pré-visualização
Carregando…
Cancelar
Salvar