* bug修复

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -333,7 +333,7 @@ public class MiniAppController extends BaseController {
 
             // 定位城市
             String location = null == lon ? null : lon + "," + lat;
-            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, getPersonId(request));
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, taPerson.getPersonId());
             result.put("city", tdCity);
 
             return ResponseBean.success(result);

src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java

@@ -291,7 +291,7 @@ public class TaRaiseRecordController extends BaseController {
                     return responseBean;
                 }
                 if (!CommConstant.PAY_STATUS_UNPAID.equals(tr.getPayStatus())) {
-                    responseBean.addError(String.format("认筹单编号为%s的记录已缴费或意图款，请重新选择", record.getRaiseRecordId()));
+                    responseBean.addError(String.format("认筹单编号为%s的记录为未缴费状态 ，请重新选择", record.getRaiseRecordId()));
                     return responseBean;
                 }
             }

src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java

@@ -72,25 +72,11 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
         if (jsonObject.getString("status").equals("1")) {
             JSONObject addressComponent = jsonObject.getJSONObject("regeocode").getJSONObject("addressComponent");
             String citycode = addressComponent.getString("citycode");
-            QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("citycode", citycode);
-            queryWrapper.eq("leveltype", 2);
-            List<TdCity> tdCities = tdCityMapper.selectList(queryWrapper);
-            if (tdCities.size() > 0) {
-                List<TdCity> cityList = selectWxCity(null, orgId);
-                Integer cityId = tdCities.get(0).getId();
-                for (TdCity tdCity : cityList) {
-                    if (tdCity.getId().equals(cityId)) {
-                        return tdCity;
-                    }
-                }
-            }
-//            return null;
-
             // 保存用户位置信息
             if (StringUtils.isNotBlank(personId)) {
                 ExecutorService threadPool = Executors.newCachedThreadPool();
                 threadPool.execute(() -> {
+                    logger.info("保存用户位置信息开始");
                     TaPersonPositon record = new TaPersonPositon();
                     try {
                         String[] locationArr = location.split(",");
@@ -113,6 +99,20 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
                 });
             }
 
+            QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("citycode", citycode);
+            queryWrapper.eq("leveltype", 2);
+            List<TdCity> tdCities = tdCityMapper.selectList(queryWrapper);
+            if (tdCities.size() > 0) {
+                List<TdCity> cityList = selectWxCity(null, orgId);
+                Integer cityId = tdCities.get(0).getId();
+                for (TdCity tdCity : cityList) {
+                    if (tdCity.getId().equals(cityId)) {
+                        return tdCity;
+                    }
+                }
+            }
+//            return null;
         }
 
         // 没有匹配到则返回默认城市