浏览代码

* bug修复

顾绍勇 5 年前
父节点
当前提交
71bdbae59a

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/MiniAppController.java 查看文件

333
 
333
 
334
             // 定位城市
334
             // 定位城市
335
             String location = null == lon ? null : lon + "," + lat;
335
             String location = null == lon ? null : lon + "," + lat;
336
-            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, getPersonId(request));
336
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId, taPerson.getPersonId());
337
             result.put("city", tdCity);
337
             result.put("city", tdCity);
338
 
338
 
339
             return ResponseBean.success(result);
339
             return ResponseBean.success(result);

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java 查看文件

291
                     return responseBean;
291
                     return responseBean;
292
                 }
292
                 }
293
                 if (!CommConstant.PAY_STATUS_UNPAID.equals(tr.getPayStatus())) {
293
                 if (!CommConstant.PAY_STATUS_UNPAID.equals(tr.getPayStatus())) {
294
-                    responseBean.addError(String.format("认筹单编号为%s的记录已缴费或意图款,请重新选择", record.getRaiseRecordId()));
294
+                    responseBean.addError(String.format("认筹单编号为%s的记录为未缴费状态 ,请重新选择", record.getRaiseRecordId()));
295
                     return responseBean;
295
                     return responseBean;
296
                 }
296
                 }
297
             }
297
             }

+ 15
- 15
src/main/java/com/huiju/estateagents/service/impl/TdCityServiceImpl.java 查看文件

72
         if (jsonObject.getString("status").equals("1")) {
72
         if (jsonObject.getString("status").equals("1")) {
73
             JSONObject addressComponent = jsonObject.getJSONObject("regeocode").getJSONObject("addressComponent");
73
             JSONObject addressComponent = jsonObject.getJSONObject("regeocode").getJSONObject("addressComponent");
74
             String citycode = addressComponent.getString("citycode");
74
             String citycode = addressComponent.getString("citycode");
75
-            QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
76
-            queryWrapper.eq("citycode", citycode);
77
-            queryWrapper.eq("leveltype", 2);
78
-            List<TdCity> tdCities = tdCityMapper.selectList(queryWrapper);
79
-            if (tdCities.size() > 0) {
80
-                List<TdCity> cityList = selectWxCity(null, orgId);
81
-                Integer cityId = tdCities.get(0).getId();
82
-                for (TdCity tdCity : cityList) {
83
-                    if (tdCity.getId().equals(cityId)) {
84
-                        return tdCity;
85
-                    }
86
-                }
87
-            }
88
-//            return null;
89
-
90
             // 保存用户位置信息
75
             // 保存用户位置信息
91
             if (StringUtils.isNotBlank(personId)) {
76
             if (StringUtils.isNotBlank(personId)) {
92
                 ExecutorService threadPool = Executors.newCachedThreadPool();
77
                 ExecutorService threadPool = Executors.newCachedThreadPool();
93
                 threadPool.execute(() -> {
78
                 threadPool.execute(() -> {
79
+                    logger.info("保存用户位置信息开始");
94
                     TaPersonPositon record = new TaPersonPositon();
80
                     TaPersonPositon record = new TaPersonPositon();
95
                     try {
81
                     try {
96
                         String[] locationArr = location.split(",");
82
                         String[] locationArr = location.split(",");
113
                 });
99
                 });
114
             }
100
             }
115
 
101
 
102
+            QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
103
+            queryWrapper.eq("citycode", citycode);
104
+            queryWrapper.eq("leveltype", 2);
105
+            List<TdCity> tdCities = tdCityMapper.selectList(queryWrapper);
106
+            if (tdCities.size() > 0) {
107
+                List<TdCity> cityList = selectWxCity(null, orgId);
108
+                Integer cityId = tdCities.get(0).getId();
109
+                for (TdCity tdCity : cityList) {
110
+                    if (tdCity.getId().equals(cityId)) {
111
+                        return tdCity;
112
+                    }
113
+                }
114
+            }
115
+//            return null;
116
         }
116
         }
117
 
117
 
118
         // 没有匹配到则返回默认城市
118
         // 没有匹配到则返回默认城市