电渠报备修复结果集匹配

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/feign/RemoteKxsProductService.java

@@ -160,5 +160,11 @@ public interface RemoteKxsProductService {
 	R changeToMchUser(@RequestBody KxsMerchant mchInfo, @RequestHeader(SecurityConstants.FROM) String from);
 
 
+	/**
+	 * 获取所以品牌
+	 *
+	 */
+	@GetExchange("/brand/list")
+    R<List<KxsBrand>> loadByAllBrand();
 
 }

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

@@ -173,16 +173,20 @@ public class KxsGdReportServiceImpl extends ServiceImpl<KxsGdReportMapper, KxsGd
         kxsGdReport.setGdSn(param.getGdSn());
 
         //判断报备的手机号码是否已经激活
-        KxsGdOrder order = kxsGdOrderService.getOne(Wrappers.<KxsGdOrder>lambdaQuery()
+        List<KxsGdOrder> orders = kxsGdOrderService.list(Wrappers.<KxsGdOrder>lambdaQuery()
                 .eq(KxsGdOrder::getGdMobile, kxsGdReport.getGdMobile())
                 .eq(KxsGdOrder::getReceiveMobile, kxsGdReport.getPutMobile()));
         //激活成功
-        if (order != null && order.getStatus() == 6) {
-            kxsGdService.toSendMq(order, kxsGdReport.getGdSn());
-            //修改为已匹配
-            kxsGdReport.setIsCheck(GdReportEnum.CHECK_SUC.getType());
+        for (KxsGdOrder order : orders) {
+            if (order.getStatus() == 6) {
+                kxsGdService.toSendMq(order, kxsGdReport.getGdSn());
+                //修改为已匹配
+                kxsGdReport.setIsCheck(GdReportEnum.CHECK_SUC.getType());
+                break;
+            }
         }
 
+
         return this.updateById(kxsGdReport);
     }