Commit 037492ec by 陶光胜

规范修改

parent cbb4fbf8
...@@ -256,11 +256,13 @@ public class StoreApiServiceImpl implements StoreApiService { ...@@ -256,11 +256,13 @@ public class StoreApiServiceImpl implements StoreApiService {
} }
@Override @Override
@Transactional
public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum) { public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum) {
return saveStoreForOrder(enterpriseId, storeCode, storeName, regionId, orderNum, null); return saveStoreForOrder(enterpriseId, storeCode, storeName, regionId, orderNum, null);
} }
@Override @Override
@Transactional
public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum, Integer storeBrandId) { public ServiceResponse<Integer> saveStoreForOrder(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String orderNum, Integer storeBrandId) {
ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId); ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
Integer storeLicenseNum = 0; Integer storeLicenseNum = 0;
...@@ -293,11 +295,13 @@ public class StoreApiServiceImpl implements StoreApiService { ...@@ -293,11 +295,13 @@ public class StoreApiServiceImpl implements StoreApiService {
} }
@Override @Override
@Transactional
public ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNo) { public ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNo) {
return saveStoreForPosMember(enterpriseId, storeCode, storeName, regionId, cardNo, null); return saveStoreForPosMember(enterpriseId, storeCode, storeName, regionId, cardNo, null);
} }
@Override @Override
@Transactional
public ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNo, Integer storeBrandId) { public ServiceResponse<Integer> saveStoreForPosMember(Integer enterpriseId, String storeCode, String storeName, Integer regionId, String cardNo, Integer storeBrandId) {
ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId); ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
Integer storeLicenseNum = 0; Integer storeLicenseNum = 0;
...@@ -336,6 +340,7 @@ public class StoreApiServiceImpl implements StoreApiService { ...@@ -336,6 +340,7 @@ public class StoreApiServiceImpl implements StoreApiService {
} }
@Override @Override
@Transactional
public ServiceResponse<Void> tranOverFlow(Integer enterpriseId, String storeIds) { public ServiceResponse<Void> tranOverFlow(Integer enterpriseId, String storeIds) {
ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId); ServiceResponse<List<EnterpriseLicenseDTO>> listEnterpriseLicense = this.enterpriseApiService.listEnterpriseLicense(enterpriseId);
if (listEnterpriseLicense.isSuccess() && CollectionUtils.isNotEmpty(listEnterpriseLicense.getResult())) { if (listEnterpriseLicense.isSuccess() && CollectionUtils.isNotEmpty(listEnterpriseLicense.getResult())) {
...@@ -583,7 +588,7 @@ public class StoreApiServiceImpl implements StoreApiService { ...@@ -583,7 +588,7 @@ public class StoreApiServiceImpl implements StoreApiService {
return ServiceResponse.success(new Page<>(pageNum, pageSize)); return ServiceResponse.success(new Page<>(pageNum, pageSize));
} }
JSONObject sortJson = null; JSONObject sortJson = null;
if(StringUtils.isNotBlank(storeSearchDTO.getLatitude()) && StringUtils.isNotBlank(storeSearchDTO.getLatitude())){ if(StringUtils.isNotBlank(storeSearchDTO.getLatitude()) && StringUtils.isNotBlank(storeSearchDTO.getLongitude())){
sortJson = QueryConditionAssemblyUtil.createSortNodeByLocation(StoreESFieldsEnum.LOCATION.getField(), QueryConditionAssemblyUtil.SORT_RULE_ASC, sortJson = QueryConditionAssemblyUtil.createSortNodeByLocation(StoreESFieldsEnum.LOCATION.getField(), QueryConditionAssemblyUtil.SORT_RULE_ASC,
Double.valueOf(storeSearchDTO.getLatitude()), Double.valueOf(storeSearchDTO.getLongitude())); Double.valueOf(storeSearchDTO.getLatitude()), Double.valueOf(storeSearchDTO.getLongitude()));
}else { }else {
...@@ -601,7 +606,7 @@ public class StoreApiServiceImpl implements StoreApiService { ...@@ -601,7 +606,7 @@ public class StoreApiServiceImpl implements StoreApiService {
if(StringUtils.isNotBlank(storeSearchDTO.getLatitude()) && StringUtils.isNotBlank(storeSearchDTO.getLongitude()) && if(StringUtils.isNotBlank(storeSearchDTO.getLatitude()) && StringUtils.isNotBlank(storeSearchDTO.getLongitude()) &&
CollectionUtils.isNotEmpty(storeDTO.getLocation())){ CollectionUtils.isNotEmpty(storeDTO.getLocation())){
double v = GeoUtils.arcDistance(Double.valueOf(storeSearchDTO.getLatitude()), Double.valueOf(storeSearchDTO.getLongitude()), double v = GeoUtils.arcDistance(Double.valueOf(storeSearchDTO.getLatitude()), Double.valueOf(storeSearchDTO.getLongitude()),
Double.valueOf(storeDTO.getLocation().get(1)), storeDTO.getLocation().get(0)); storeDTO.getLocation().get(1), storeDTO.getLocation().get(0));
storeDTO.setDistance(v); storeDTO.setDistance(v);
} }
result.add(storeDTO); result.add(storeDTO);
...@@ -892,6 +897,7 @@ public class StoreApiServiceImpl implements StoreApiService { ...@@ -892,6 +897,7 @@ public class StoreApiServiceImpl implements StoreApiService {
} }
@Override @Override
@Transactional
public ServiceResponse<String> importStoreForOperation(ProcessBatchStoreDTO processBatchStoreDTO) { public ServiceResponse<String> importStoreForOperation(ProcessBatchStoreDTO processBatchStoreDTO) {
logger.info("批量处理门店:{}", JSON.toJSONString(processBatchStoreDTO)); logger.info("批量处理门店:{}", JSON.toJSONString(processBatchStoreDTO));
StoreDTO storeDTO = new StoreDTO(); StoreDTO storeDTO = new StoreDTO();
...@@ -1066,6 +1072,7 @@ public class StoreApiServiceImpl implements StoreApiService { ...@@ -1066,6 +1072,7 @@ public class StoreApiServiceImpl implements StoreApiService {
} }
@Override @Override
@Transactional
public ServiceResponse<Void> saveStoreAndClerkForBulkOrder(String params) { public ServiceResponse<Void> saveStoreAndClerkForBulkOrder(String params) {
logger.info("saveStoreAndClerkForBulkOrder:{}", params); logger.info("saveStoreAndClerkForBulkOrder:{}", params);
Map<String, Object> message = new HashMap<>(); Map<String, Object> message = new HashMap<>();
......
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