ccj преди 2 години
родител
ревизия
0b4973bf81

+ 8 - 1
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyReleaseGoodsInfoServiceImpl.java

@@ -141,12 +141,19 @@ public class HyReleaseGoodsInfoServiceImpl extends ServiceImpl<HyReleaseGoodsInf
             }
             //周边信息列表
             List<HyReleaseGoodsInfo> dataList1 = baseMapper.getAllListsByCondition(pageView);
-            dataList1.removeAll(dataList);
+//            dataList1.removeAll(dataList);
+            String param = "";
+            for(HyReleaseGoodsInfo tmp : dataList){
+                param += tmp.getId()+",";
+            }
             if (!CollectionUtils.isEmpty(dataList1)) {
                 if (!StringUtils.isEmpty(hyReleaseGoodsInfo.getLoadingPlaceCity())) {
                     //查询发货地经纬度
                     for (int i = 0; i < dataList1.size(); i++) {
                         HyReleaseGoodsInfo hyReleaseGoodsInfo1 = dataList1.get(i);
+                        if(param.contains(hyReleaseGoodsInfo1.getId())){
+                            continue;
+                        }
                         //发货地经纬度
                         double lng2 = Math.toRadians(Double.valueOf(hyReleaseGoodsInfo1.getSendLongitude()));
                         double lat2 = Math.toRadians(Double.valueOf(hyReleaseGoodsInfo1.getSendLatitude()));