广电激活数据接收物流相关信息

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdServiceImpl.java

@@ -32,8 +32,12 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -131,8 +135,7 @@ public class KxsGdServiceImpl implements KxsGdService {
                 kxsGdOrder.setUserName(orderData.getString("userName"));
                 kxsGdOrder.setGdMobile(orderData.getString("mobile"));
                 kxsGdOrder.setOrderNo(orderData.getString("orderNo"));
-                kxsGdOrder.setErpName(orderData.getString("logisticsCompany"));
-                kxsGdOrder.setErpNo(orderData.getString("logisticsNo"));
+
                 kxsGdOrder.setIdcardNo(orderData.getString("idcardNo"));
                 kxsGdOrder.setReceiveName(orderData.getString("receiveName"));
                 kxsGdOrder.setReceiveMobile(orderData.getString("receiveMobile"));
@@ -150,6 +153,8 @@ public class KxsGdServiceImpl implements KxsGdService {
                 if (kxsGdOrder == null) {
                     continue;
                 }
+                kxsGdOrder.setErpName(orderData.getString("logisticsCompany"));
+                kxsGdOrder.setErpNo(orderData.getString("logisticsNo"));
                 kxsGdOrder.setStatus(Integer.valueOf(status));
                 gdOrderService.updateById(kxsGdOrder);
                 //激活成功
@@ -168,6 +173,7 @@ public class KxsGdServiceImpl implements KxsGdService {
             }
         }
     }
+    
 
     private void toSendMq(KxsGdOrder order, String sn){
         RabbitGdActQueueMQ.MsgEntity msgEntity = new RabbitGdActQueueMQ.MsgEntity();