车辆信息变更-审核

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/log/OperateType.java

@@ -149,6 +149,8 @@ public enum OperateType {
     CHANGE_VEHICLE_RECE("车辆信息修改确认收货"),
     CHANGE_VEHICLE_PAYQUERY("车辆信息修改支付查询"),
     CHANGE_VEHICLE_PAYAPPLY("车辆信息修改支付申请"),
+    CHANGE_VEHICLE_SIGNQUERY("车辆信息修改签约查询"),
+    CHANGE_VEHICLE_SIGNPARAM("车辆信息修改获取签约参数"),
     //客户信息修改
     CUSTOMER_INFO_CHANGE_APPLY_SELF("个人客户信息修改申请"),
     CUSTOMER_INFO_CHANGE_APPLY_UNIT("单位客户信息修改申请"),

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/vehicleChange/VehicleChangeReviewManagew.java

@@ -36,7 +36,7 @@ import java.util.Map;
 @Service
 public class VehicleChangeReviewManagew extends AbstractCommManager {
 
-    public static final String CAR_CHANGE = "carChange";
+    public static final String CAR_CHANGE = "carChange";//主体审核用到
 
     @Autowired
     private AssVehicleInfoChangeRepo assVehicleInfoChangeRepo;
@@ -85,27 +85,31 @@ public class VehicleChangeReviewManagew extends AbstractCommManager {
     //通过处理
     private void tg(AssOrderAuditRequest request, AssOrderinfo order, Staff staff, Map<String, Object> dataStream) throws ServiceHandleException {
         AssVehicleInfoChange vehicleInfoChange = assVehicleInfoChangeRepo.findByOrderNo(request.getOrderNo());
+        QtkVehicleInfo oldVehicle = qtkVehicleInfoRepo.findByVehicleId(order.getVehicleId());
         Boolean flag = false;//是否需要升级设备
-        //车牌变更(只有记账卡，才有支付签约问题)
-        if (order.getCardType() == CardType.CHARGE_CARD && vehicleInfoChange.getChangeType()) {
-            //有产品说明渠道不支持更换车牌，选择产品进行支付签约
-            if (hasText(vehicleInfoChange.getProductId())) {
-                order.setOrderStep(AssOrderStep.WAITING_PAY);
+        //车牌变更
+        if (vehicleInfoChange.getChangeType()) {
+            flag = true;
+            //(只有记账卡，才有支付签约问题)
+            if (order.getCardType() == CardType.CHARGE_CARD) {
+                //有产品说明渠道不支持更换车牌，选择产品进行支付签约
+                if (hasText(vehicleInfoChange.getProductId())) {
+                    order.setOrderStep(AssOrderStep.WAITING_PAY);
+                }else {
+                    order.setOrderStep(AssOrderStep.WAITING_UPGRADE);
+                }
             }else {
-                //渠道支持（包括必须支持，如：储值卡的直接变更）车牌发生变化需要重新签约
-                order.setOrderStep(AssOrderStep.WAITING_SIGN);
-                flag = true;
+                order.setOrderStep(AssOrderStep.WAITING_UPGRADE);
             }
         }
-        //车辆信息变更(车型发生变化，需要设备升级，如果需要选择产品重新发行，就没有升级的步骤)
-        QtkVehicleInfo oldVehicle = qtkVehicleInfoRepo.findByVehicleId(order.getVehicleId());
-        if (!hasText(vehicleInfoChange.getProductId()) && !vehicleInfoChange.getType().equals(oldVehicle.getType())) {
-            //收费车型发生改变，升级设备
-            if (!flag) {//如果flag 为true 说明前面需要签约，不可再改变订单阶段（升级设备的是交给签约判断），为false则阶段是升级设备
+        if (!flag){
+            //车牌没有发生变更，才需要走此逻辑（看车型变化是否需要设备升级）
+            if (!vehicleInfoChange.getType().equals(oldVehicle.getType())) {
                 order.setOrderStep(AssOrderStep.WAITING_UPGRADE);
+                flag = true;
             }
-            flag = true;
         }
+
         if (flag){
             //下黑6
             CardInRequest cardInRequest = new CardInRequest();
@@ -121,6 +125,9 @@ public class VehicleChangeReviewManagew extends AbstractCommManager {
             //设备需升级写入表
             inDeviceUpTable(order,vehicleInfoChange);
 
+        }else {
+            order.setOrderStep(AssOrderStep.COMPLETED);
+            order.setOrderStatus(AssOrderStatus.FINISHED);
         }
         //变更车辆信息
         changeVehicle(oldVehicle,vehicleInfoChange);