Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -52,6 +52,9 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     @Autowired
     private  AppUserDetailBiz appUserDetailBiz;
 
+    @Value("${admin.validTime}")
+    private  Long  validTime;
+
     /**
      * 关系绑定
      * @param userId
@@ -63,13 +66,16 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             return;
         }
         AppUserRelation relation=getMyBiz().getRelationByUserId(parentId);
+        Long time=System.currentTimeMillis();
          if(relation==null){
              relation=new AppUserRelation();
              relation.setUserId(parentId);
+             relation.setIsForever(1);
+             relation.setBindTime(time);
+             relation.setBindType(type);
              insertSelective(relation);
          }
         relation=getMyBiz().getRelationByUserId(userId);
-        Long time=System.currentTimeMillis();
          if(relation==null){
              relation=new AppUserRelation();
              relation.setUserId(userId);
@@ -78,7 +84,8 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
              relation.setBindTime(time);
              insertSelective(relation);
          }else {
-             if(relation.getParentId()==null||relation.getParentId()==0||(relation.getIsForever()!=1&&(time-relation.getBindTime())>3600)){
+             //用户存在父id为0的不能成为任何人下线
+             if((relation.getIsForever()!=1&&(time-relation.getBindTime())>validTime)){
                  relation.setParentId(parentId);
                  relation.setBindType(type);
                  relation.setBindTime(time);
@@ -86,7 +93,6 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
              }
          }
     }
-
     //首页关系绑定
     public  ObjectRestResponse  appBindRelation(Integer userId,String code){
         Integer parentId=0;

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -167,11 +167,13 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         }
         campsiteShopDetailVo.setTypeNames(shopTagDTOS == null ? Collections.EMPTY_LIST : shopTagDTOS.stream().map(CampsiteShopTagDTO::getName).collect(Collectors.toList()));
         //根据经纬度算距离
+        if (campsiteShopDetailDTO.getLongitude()!=null && campsiteShopDetailDTO.getLatitude()!=null) {
             double distance = getDistance(campsiteShopDetailDTO.getLongitude(), campsiteShopDetailDTO.getLatitude(), longitude, latitude);
             if (log.isDebugEnabled()) {
                 log.debug("根据店铺经度=【{}】,纬度=【{}】和自己所在位置的经度=【{}】,纬度=【{}】计算出的距离：【{}km】", campsiteShopDetailDTO.getLongitude(), campsiteShopDetailDTO.getLatitude(), longitude, latitude, distance);
             }
             campsiteShopDetailVo.setDistance(String.format("%.1f", distance));
+        }
         campsiteValueOperations.set(String.format("%s%d", CAMSITE_DETAIL_CACHE_PREKEY, id), JSONObject.toJSONString(campsiteShopDetailVo));
         return campsiteShopDetailVo;
     }