广电报备接收推送数据bug修复

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

@@ -149,6 +149,9 @@ public class KxsGdServiceImpl implements KxsGdService {
                 String orderNo = orderData.getString("orderNo");
                 //1 订单生成2 订单正在运行3 待发货4 配送中5 订单成功结束6 已激活成功11 办理失败12 拒签13 订单取消中14 订单取消
                 String status = orderData.getString("status");
+                if(StrUtil.isBlank(status) || StrUtil.isBlank(orderNo)){
+                    continue;
+                }
                 KxsGdOrder kxsGdOrder = gdOrderService.getOne(Wrappers.<KxsGdOrder>lambdaQuery().eq(KxsGdOrder::getOrderNo, orderNo));
                 if (kxsGdOrder == null) {
                     continue;
@@ -160,6 +163,7 @@ public class KxsGdServiceImpl implements KxsGdService {
                 //激活成功
                 if("6".equals(status)){
                     KxsGdReport kxsGdReport = kxsGdReportMapper.selectOne(Wrappers.<KxsGdReport>lambdaQuery()
+                            .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())
                             .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_NO.getType())
                             .eq(KxsGdReport::getGdMobile, kxsGdOrder.getGdMobile()));
                     if (kxsGdReport == null) {
@@ -173,7 +177,6 @@ public class KxsGdServiceImpl implements KxsGdService {
             }
         }
     }
-    
 
     private void toSendMq(KxsGdOrder order, String sn){
         RabbitGdActQueueMQ.MsgEntity msgEntity = new RabbitGdActQueueMQ.MsgEntity();