短信调整

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/managew/DeviceReactivateModel.java

@@ -13,5 +13,7 @@ public class DeviceReactivateModel {
     private Integer vehicleType;
     private String orderNo;
     private String orderId;
+    private String cardId;
+    private String obuId;
 
 }

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/ActiveManagerImpl.java

@@ -4,6 +4,9 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.com.taiji.core.entity.basic.QtkObuInfo;
+import cn.com.taiji.core.entity.dict.basic.CardStatus;
+import cn.com.taiji.core.entity.dict.basic.ObuStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -95,12 +98,20 @@ public class ActiveManagerImpl extends AbstractCommManager implements ActiveMana
             List<QtkVehicleInfo> vehicleInfos = vehicleInfoRepo.findByCustomerId(requestDTO.getCustomerId());
             if (!vehicleInfos.isEmpty()){
                 for (QtkVehicleInfo vehicleInfo : vehicleInfos) {
-                    DeviceReactivateModel model = new DeviceReactivateModel();
-                    BeanTools.copyProperties(vehicleInfo, model);
-                    model.setMobile(customerInfo.getCustomerTel());
-                    model.setVehicleType(vehicleInfo.getType());
-                    model.setActiveType(2);
-                    list.add(model);
+                    QtkCardInfo cardInfo = cardInfoRepo.findByVehicleIdAndCardStatus(vehicleInfo.getVehicleId(), CardStatus.ZC);
+                    QtkObuInfo obuInfo = obuInfoRepo.findByVehicleIdAndObuStatus(vehicleInfo.getVehicleId(), ObuStatus.ZC);
+                    if (cardInfo != null){
+                        DeviceReactivateModel model = new DeviceReactivateModel();
+                        BeanTools.copyProperties(vehicleInfo, model);
+                        model.setMobile(customerInfo.getCustomerTel());
+                        model.setVehicleType(vehicleInfo.getType());
+                        model.setCardId(cardInfo.getCardId());
+                        if (obuInfo != null){
+                            model.setObuId(obuInfo.getObuId());
+                        }
+                        model.setActiveType(2);
+                        list.add(model);
+                    }
                 }
             }
             List<IssueOrderinfo> orderinfos = issueOrderinfoRepo.listByCustomerId(requestDTO.getCustomerId());