|
@@ -1476,8 +1476,6 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
storeIn.setLogoutCode(null);
|
|
|
// 清空注销申请时间
|
|
|
storeIn.setLogoutTime(null);
|
|
|
- // 更新logout_flag状态为0
|
|
|
- storeIn.setLogoutFlag(0);
|
|
|
int num = storeInfoMapper.updateById(storeIn);
|
|
|
if (num > 0) {
|
|
|
// 发送通知
|
|
@@ -1537,15 +1535,13 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
businessTypeNames.add(storeDictionary.getDictDetail());
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
StoreInfo storeInfo = new StoreInfo();
|
|
|
BeanUtils.copyProperties(storeInfodto, storeInfo);
|
|
|
|
|
|
- //存入门店状态
|
|
|
- storeInfo.setStoreStatus(storeInfodto.getStoreStatus());
|
|
|
//存入经纬度
|
|
|
storeInfo.setStorePosition(storeInfodto.getStorePositionLongitude() + "," + storeInfodto.getStorePositionLatitude());
|
|
|
-
|
|
|
+ //存入门店状态
|
|
|
+ storeInfo.setStoreStatus(storeInfodto.getStoreStatus());
|
|
|
//板块及类型
|
|
|
storeInfo.setBusinessSection(businessSection);
|
|
|
storeInfo.setBusinessSectionName(businessSectionName.getDictDetail());
|
|
@@ -1564,7 +1560,6 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
essentialCityCodeMapper.selectOne(new LambdaQueryWrapper<EssentialCityCode>().eq(EssentialCityCode::getAreaCode, storeInfo.getAdministrativeRegionDistrictAdcode()));
|
|
|
storeInfo.setAdministrativeRegionDistrictName(essentialCityCode3.getAreaName());
|
|
|
int num = storeInfoMapper.updateById(storeInfo);
|
|
|
- System.out.println(num);
|
|
|
if(!StringUtils.isEmpty(storeInfodto.getStorePositionLongitude())&&!StringUtils.isEmpty(storeInfodto.getStorePositionLatitude())){
|
|
|
nearMeService.inGeolocation(new Point(Double.parseDouble(storeInfodto.getStorePositionLongitude()),
|
|
|
Double.parseDouble(storeInfodto.getStorePositionLatitude())), storeInfo.getId().toString(), Boolean.TRUE);
|
|
@@ -1619,10 +1614,7 @@ public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo
|
|
|
queryWrapper.eq(StoreInfo::getId, id);
|
|
|
StoreInfo storeInfo = storeInfoMapper.selectOne(queryWrapper);
|
|
|
if (storeInfo != null && storeInfo.getBusinessStatus() == -1) {
|
|
|
- int num = storeInfoMapper.deleteById(id);
|
|
|
- if (num <= 0) {
|
|
|
- throw new RuntimeException("删除失败");
|
|
|
- }
|
|
|
+ storeInfoMapper.deleteById(id);
|
|
|
}
|
|
|
}
|
|
|
|