卡签续期调整

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

@@ -214,21 +214,24 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
 
         String customerId = "";
         String vehicleId = "";
+        String channelId = "";
         if (cardInfo != null){
             orderinfo.setCardId(cardInfo.getCardId());
             customerId = cardInfo.getCustomerId();
             vehicleId =cardInfo.getVehicleId();
+            channelId = cardInfo.getChannelId();
         }else {
+            orderinfo.setObuId(obuInfo.getObuId());
             customerId = obuInfo.getCustomerId();
             vehicleId = obuInfo.getVehicleId();
-            orderinfo.setObuId(obuInfo.getObuId());
+            channelId = obuInfo.getChannelId();
         }
         orderinfo.setOrderNo(createOrderNo(findAgencyIdByToken(dto.getAccessToken())));
         orderinfo.setOrderSource(dto.getOrderSource());
         orderinfo.setOrderStatus(AssOrderStatus.FINISHED);
         orderinfo.setAuditStatus(AuditStatus.COMPLETE);
         orderinfo.setOrderType(AssOrderType.RENEWAL);
-        orderinfo.setChannelId(cardInfo.getChannelId());
+        orderinfo.setChannelId(channelId);
         orderinfo.setApplyTime(now);
         String openId = findOpenIdByToken(dto.getAccessToken());
         if (SourceType.SERVICE_HALL.equals(dto.getOrderSource())) {