Commit 23063b48 by guojuxing

Merge remote-tracking branch 'origin/developer' into developer

parents 08cdcc19 4164e516
......@@ -34,7 +34,6 @@ import org.apache.logging.log4j.Logger;
import org.elasticsearch.common.geo.GeoUtils;
import org.redisson.api.RKeys;
import org.redisson.api.RedissonClient;
import org.reflections.Store;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
......@@ -161,7 +160,11 @@ public class StoreApiServiceImpl implements StoreApiService {
return ServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), ErrorCode.NOTEXISTS.getMsg());
}
// 记录门店日志
saveUpdateLog(existStore.getResult(), storeDTO);
try {
saveUpdateLog(existStore.getResult(), storeDTO);
} catch (Exception e) {
logger.warn("门店编辑日志记录错误", e);
}
}
// 自定义属性
storeExtendService.saveOrUpdate(storeDTO.getEnterpriseId(), storeDTO.getStoreInfoId(), storeDTO.getStoreExtendList());
......@@ -383,7 +386,7 @@ public class StoreApiServiceImpl implements StoreApiService {
storeDTO.setStoreGroupId(Integer.valueOf(groupId));
} else {
// 未命中
if (storeDTO.getStoreGroupId() != null) {
if (storeDTO.getStoreGroupId() == null) {
TabStoreGroup group = storeGroupService.selectUnGroupedStore(storeDTO.getEnterpriseId());
storeDTO.setStoreGroupId(group.getStoreGroupId());
}
......
......@@ -204,6 +204,22 @@ public class StoreTaskServiceImpl extends AbstractTaskAllocationOperation implem
storeDTO.setIsEditStoreGroup(0);
}
// 经纬度校验
if (StringUtils.isNotBlank(storeDTO.getLongitude())) {
try {
Float.valueOf(storeDTO.getLongitude());
} catch (NumberFormatException e) {
t.setErrorMessage("经度错误");
}
}
if (StringUtils.isNotBlank(storeDTO.getLatitude())) {
try {
Float.valueOf(storeDTO.getLatitude());
} catch (NumberFormatException e) {
t.setErrorMessage("维度错误");
}
}
// 判断分组
// if (Integer.valueOf(1) == storeStrategyApiService.getStoreGroupStrategyWeight(t.getEnterpriseId()).getResult()) {
// // 不启用分组策略
......
......@@ -463,9 +463,32 @@ public class StoreImportController {
// validate = false;
// }
// }
bean.setLongitude(row.get(12));
bean.setLatitude(row.get(13));
// 经纬度校验
if (StringUtils.isNotBlank(bean.getLongitude())) {
try {
Float longitude = Float.valueOf(bean.getLongitude());
if (longitude < 0 || longitude > 180) {
errorMessage.append("经度错误,");
}
} catch (NumberFormatException e) {
errorMessage.append("经度错误,");
}
}
if (StringUtils.isNotBlank(bean.getLatitude())) {
try {
Float latitude = Float.valueOf(bean.getLatitude());
if (latitude < 0 || latitude > 90) {
errorMessage.append("维度错误,");
}
} catch (NumberFormatException e) {
errorMessage.append("维度错误,");
}
}
// 自定义属性
ServiceResponse<List<StoreFieldDTO>> fieldServiceResponse = storeFieldApiService.listStoreFieldByRegionId(regionId);
List<StoreFieldDTO> fieldList = fieldServiceResponse.getResult();
......@@ -550,12 +573,10 @@ public class StoreImportController {
return serviceResponse.isSuccess() ? serviceResponse.getResult() : null;
}
// @RequestMapping("/test")
// public Object re() {
// List<StoreTmpDTO> storeTmpDTOS = storeImportApiService.listStoreTmp(1111, null, true);
// System.out.println(storeTmpDTOS);
// return null;
// }
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment