修改

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/comm/VehicleInfoQueryDeviceResponseDTO.java

@@ -47,6 +47,9 @@ public class VehicleInfoQueryDeviceResponseDTO extends BaseModel {
     
     @ApiModelProperty(value = "卡号")
     private String cardId;
+
+    @ApiModelProperty(value = "卡类型")
+    private Integer cardType;
     
     @ApiModelProperty(value = "卡类型")
     private CardType cardTypeNew;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/model/base/VehicleInfoQueryDeviceModel.java

@@ -2,6 +2,7 @@ package cn.com.taiji.iaw.model.base;
 
 import cn.com.taiji.common.model.BaseModel;
 import cn.com.taiji.core.entity.dict.basic.CardStatus;
+import cn.com.taiji.core.entity.dict.basic.CardType;
 import cn.com.taiji.core.entity.dict.basic.ObuStatus;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -27,6 +28,9 @@ public class VehicleInfoQueryDeviceModel extends BaseModel {
     @ApiModelProperty(value = "卡类型")
     private Integer cardType;
 
+    @ApiModelProperty(value = "卡类型cardTypeNew")
+    private CardType cardTypeNew;
+
     @ApiModelProperty(value = "卡状态")
     private CardStatus cardStatus;
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/basic/BasicInfoVehicleModel.java

@@ -66,6 +66,9 @@ public class BasicInfoVehicleModel extends BaseModel {
 
 
     public int getUseCharacterCode() {
-        return useCharacter.getCode();
+        if(useCharacter != null){
+            return useCharacter.getCode();
+        }
+        return -1;
     }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/device/CommDeviceCancelManager.java

@@ -8,6 +8,7 @@ import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
 import cn.com.taiji.core.entity.basic.QtkObuInfo;
 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.IdType;
 import cn.com.taiji.core.entity.dict.basic.UserType;
@@ -17,7 +18,6 @@ import cn.com.taiji.core.entity.log.IasInterfaceLog;
 import cn.com.taiji.core.entity.user.AccountInfo;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.model.comm.protocol.msgw.send.MsgwWxMpSendRequest;
-import cn.com.taiji.core.model.comm.protocol.msgw.send.MsgwWxMpSendResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.core.repo.jpa.ass.AssDeviceCancelRepo;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
@@ -120,10 +120,29 @@ public class CommDeviceCancelManager extends AbstractCommManager {
     }
 
     // 查询正在中的订单
-    public void queryNormalOrder(String customerId) throws ServiceHandleException {
+    public void handleNormalOrder(String customerId, String type) throws ServiceHandleException {
         List<AssOrderinfo> orders = orderInfoRepo.findByCustomerIdAndOrderTypeStatus(customerId, AssOrderType.CANCEL, AssOrderStatus.NORMAL);
-        if (!orders.isEmpty()) {
-            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("正在处理中，请勿重复提交！");
+        if("apply".equals(type)) {
+            if (!orders.isEmpty()) {
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("正在处理中，请勿重复提交！");
+            }
+        }else if("query".equals(type)){
+            boolean isExist = false;
+            if (!orders.isEmpty()) {
+                for (AssOrderinfo order : orders) {
+                    if (AssOrderStep.WAITING_PAY.equals(order.getOrderStep())) {
+                        order.setOrderStatus(AssOrderStatus.CLOSE);
+                        order.setUpdateTime(LocalDateTime.now());
+                        order.setRemark("客户未完成注销，已关闭");
+                        order.setOrderStep(AssOrderStep.COMPLETED);
+                    } else if (AssOrderStep.WAITING_AUDIT.equals(order.getOrderStep())) {
+                        isExist = true;
+                    }
+                }
+            }
+            if (isExist) {
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("正在处理中，请勿重复提交！");
+            }
         }
     }
 

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/device/DeviceCancelQueryManager.java

@@ -5,10 +5,8 @@ import cn.com.taiji.core.entity.basic.QtkCardInfo;
 import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
 import cn.com.taiji.core.entity.basic.QtkObuInfo;
 import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
-import cn.com.taiji.core.entity.dict.basic.UserType;
 import cn.com.taiji.core.entity.issue.IssueProduct;
 import cn.com.taiji.core.entity.log.IasInterfaceLog;
-import cn.com.taiji.core.entity.user.AccountInfo;
 import cn.com.taiji.core.manager.comm.LogManager;
 import cn.com.taiji.core.model.comm.protocol.bls.CardQueryRequest;
 import cn.com.taiji.core.model.comm.protocol.bls.CardQueryResponse;
@@ -50,6 +48,9 @@ public class DeviceCancelQueryManager extends CommDeviceCancelManager implements
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("车卡签信息校验失败");
         }
 
+        // 查询是否有待支付的售后，有要全部关闭
+        handleNormalOrder(customer.getCustomerId(),"query");
+
         // 通知详情信息
         StringBuilder sb = new StringBuilder();
         sb.append("当前设备");