广电报备不匹配广电的sn

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

@@ -58,20 +58,21 @@ public class KxsGdServiceImpl implements KxsGdService {
                     if ("已激活".equals(gdQueryOrder.getActivationStatusName())) {
                         KxsGdReport kxsGdReport = kxsGdReportMapper.selectOne(Wrappers.<KxsGdReport>lambdaQuery()
                                 .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_NO.getType())
-                                .eq(KxsGdReport::getGdSn, gdQueryOrder.getIccId())
+//                                .eq(KxsGdReport::getGdSn, gdQueryOrder.getIccId())
                                 .eq(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
-                        if (kxsGdReport != null) {
-                            //发送广电激活MQ消息
-                            RabbitGdActQueueMQ.MsgEntity msgEntity = new RabbitGdActQueueMQ.MsgEntity();
-                            BeanUtil.copyProperties(gdQueryOrder, msgEntity);
-                            mqSender.send(RabbitGdActQueueMQ.build(msgEntity));
-
-                            kxsGdReportMapper.update(null, Wrappers.<KxsGdReport>lambdaUpdate().eq(KxsGdReport::getId, kxsGdReport.getId())
-                                    .set(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
-                                    .set(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
-                            log.info("发送广电激活数据{}", kxsGdReport.getGdSn()
-                                    + "," + kxsGdReport.getGdMobile());
+                        if (kxsGdReport == null) {
+                            continue;
                         }
+                        //发送广电激活MQ消息
+                        RabbitGdActQueueMQ.MsgEntity msgEntity = new RabbitGdActQueueMQ.MsgEntity();
+                        BeanUtil.copyProperties(gdQueryOrder, msgEntity);
+                        mqSender.send(RabbitGdActQueueMQ.build(msgEntity));
+
+                        kxsGdReportMapper.update(null, Wrappers.<KxsGdReport>lambdaUpdate().eq(KxsGdReport::getId, kxsGdReport.getId())
+                                .set(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
+                                .set(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
+                        log.info("发送广电激活数据{}", kxsGdReport.getGdSn()
+                                + "," + kxsGdReport.getGdMobile());
                     }
                 }
                 pageNo++;