Commit 501f4433 by ping.wu

FeignClient 修改

parent 9cd5930b
......@@ -10,7 +10,7 @@ import cn.freemud.entities.vo.*;
import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.manager.*;
import cn.freemud.service.thirdparty.StoreClient;
//import cn.freemud.service.thirdparty.StoreClient;
import cn.freemud.utils.*;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
......@@ -39,8 +39,8 @@ public class StoreServiceImpl {
@Autowired
private StoreAdapter storeAdapter;
@Autowired
private StoreClient storeClient;
// @Autowired
// private StoreClient storeClient;
@Autowired
private IappWxappConfigManager iappWxappConfigManager;
@Autowired
......@@ -88,82 +88,82 @@ public class StoreServiceImpl {
/**
* 查询门店图片(1 :门店banner 2:门店照片)
*/
private List<StoreImagesResponseVo> getStoreImages(String partnerId, String storeId, Integer typeFlag) {
StoreImagesRequestDto storeImagesRequestDto = storeAdapter.convert2StoreImagesRequestDto(partnerId, storeId, typeFlag);
try {
StoreBaseResponseDto<StoreImageListResponseDto> storeImages = storeClient.findStoreImages(storeImagesRequestDto);
if (!RESPONSE_SUCCESS_CODE.equals(storeImages.getStatusCode()) || storeImages.getBizVO() == null
|| CollectionUtils.isEmpty(storeImages.getBizVO().getList())) {
log.info("getStoreImages storeImages:{}", gson.toJson(storeImages));
return Collections.emptyList();
}
List<StoreImgResponseDto> storeImgResponseDtos = storeImages.getBizVO().getList();
List<StoreImagesResponseVo> images = new ArrayList<>();
for (int i = 0; i < storeImgResponseDtos.size(); i++) {
storeImgResponseDtos.get(i).getImg().forEach(storeImgResponseDto -> {
StoreImagesResponseVo storeImagesResponse = new StoreImagesResponseVo();
storeImagesResponse.setImageUrl(storeImgResponseDto.getImageUrl());
images.add(storeImagesResponse);
});
}
return images;
} catch (Exception e) {
log.error("findStoreImages is error !!!", e);
return Collections.emptyList();
}
}
// private List<StoreImagesResponseVo> getStoreImages(String partnerId, String storeId, Integer typeFlag) {
// StoreImagesRequestDto storeImagesRequestDto = storeAdapter.convert2StoreImagesRequestDto(partnerId, storeId, typeFlag);
// try {
// StoreBaseResponseDto<StoreImageListResponseDto> storeImages = storeClient.findStoreImages(storeImagesRequestDto);
// if (!RESPONSE_SUCCESS_CODE.equals(storeImages.getStatusCode()) || storeImages.getBizVO() == null
// || CollectionUtils.isEmpty(storeImages.getBizVO().getList())) {
// log.info("getStoreImages storeImages:{}", gson.toJson(storeImages));
// return Collections.emptyList();
// }
// List<StoreImgResponseDto> storeImgResponseDtos = storeImages.getBizVO().getList();
// List<StoreImagesResponseVo> images = new ArrayList<>();
// for (int i = 0; i < storeImgResponseDtos.size(); i++) {
// storeImgResponseDtos.get(i).getImg().forEach(storeImgResponseDto -> {
// StoreImagesResponseVo storeImagesResponse = new StoreImagesResponseVo();
// storeImagesResponse.setImageUrl(storeImgResponseDto.getImageUrl());
// images.add(storeImagesResponse);
// });
// }
// return images;
// } catch (Exception e) {
// log.error("findStoreImages is error !!!", e);
// return Collections.emptyList();
// }
// }
/**
* 获取门店信息
*/
public StoreResponseDto getStoreInfo(String partnerId, String storeCode) {
StoreInfoRequestDto storeInfoRequestDto = new StoreInfoRequestDto(partnerId, storeCode);
LogUtil.info("getStoreInfo_request_start", gson.toJson(storeInfoRequestDto), null);
StoreBaseResponseDto<StoreResponseDto> response;
try {
// 根据商户ID 和 门店编码查询门店信息
response = storeClient.getStoreInfo(storeInfoRequestDto);
LogUtil.info("getStoreInfo_request_end", gson.toJson(storeInfoRequestDto), gson.toJson(response));
if (!RESPONSE_SUCCESS_CODE.equals(response.getStatusCode()) || response.getBizVO() == null) {
LogUtil.info("getStoreInfo 获取门店信息失败", gson.toJson(storeInfoRequestDto), gson.toJson(response));
throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
}
} catch (Exception e) {
LogUtil.error("getStoreInfo 获取门店信息异常", gson.toJson(storeInfoRequestDto), gson.toJson(storeInfoRequestDto), e);
log.error("getStoreInfo is error ,storeInfoRequestDto:{} !! ", storeInfoRequestDto, e);
throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
}
StoreResponseDto storeResponseDto = response.getBizVO();
//TODO 设置营业开始和结束时间
String businessHourStr = storeResponseDto.getBusinessHoursDay().replace("-", ",").replace("_", ",");
String[] businessHours = businessHourStr.split(",");
if (businessHours.length != 2) {
log.error("checkStoreOpen businessHoursDay is invaild , businessHoursDay:{}", storeResponseDto.getBusinessHoursDay());
throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
}
String startDateTimeStr = DateUtil.convert2String(new Date(), DateUtil.FORMAT_YMD) + " " + businessHours[0] + ":00";
Date startDateTime = DateUtil.convert2Date(startDateTimeStr, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
String endDateTimeStr = DateUtil.convert2String(new Date(), DateUtil.FORMAT_YMD) + " " + businessHours[1] + ":00";
SimpleDateFormat hhmmss = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date endDateTime;
try {
endDateTime = hhmmss.parse(endDateTimeStr);
} catch (ParseException e) {
log.error("checkStoreOpen businessHoursDay endDateTimeStr is invaild , endDateTimeStr:{}", endDateTimeStr);
throw new ServiceException(ResponseResult.STORE_BUSINESS_HOUR_ERROR);
}
storeResponseDto.setBusinessHoursDayStartTime(startDateTime);
storeResponseDto.setBusinessHoursDayEndTime(endDateTime);
//TODO 设置门店图片
List<StoreImagesResponseVo> storeImagesResponseVos = getStoreImages(partnerId, storeResponseDto.getStoreId(), 2);
if (CollectionUtils.isNotEmpty(storeImagesResponseVos)) {
storeResponseDto.setImageUrl(storeImagesResponseVos.get(0).getImageUrl());
}
//TODO 查询门店外卖配送信息
OpenPlatformPartnerStoreDeliveryConfig deliveryConfig = deliveryConfigManager.findByPartnerIdAndStoreCode(partnerId, storeCode);
storeResponseDto.setStoreDeliveryConfig(deliveryConfig);
return storeResponseDto;
}
// public StoreResponseDto getStoreInfo(String partnerId, String storeCode) {
// StoreInfoRequestDto storeInfoRequestDto = new StoreInfoRequestDto(partnerId, storeCode);
// LogUtil.info("getStoreInfo_request_start", gson.toJson(storeInfoRequestDto), null);
// StoreBaseResponseDto<StoreResponseDto> response;
// try {
// // 根据商户ID 和 门店编码查询门店信息
// response = storeClient.getStoreInfo(storeInfoRequestDto);
// LogUtil.info("getStoreInfo_request_end", gson.toJson(storeInfoRequestDto), gson.toJson(response));
// if (!RESPONSE_SUCCESS_CODE.equals(response.getStatusCode()) || response.getBizVO() == null) {
// LogUtil.info("getStoreInfo 获取门店信息失败", gson.toJson(storeInfoRequestDto), gson.toJson(response));
// throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
// }
// } catch (Exception e) {
// LogUtil.error("getStoreInfo 获取门店信息异常", gson.toJson(storeInfoRequestDto), gson.toJson(storeInfoRequestDto), e);
// log.error("getStoreInfo is error ,storeInfoRequestDto:{} !! ", storeInfoRequestDto, e);
// throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
// }
// StoreResponseDto storeResponseDto = response.getBizVO();
// //TODO 设置营业开始和结束时间
// String businessHourStr = storeResponseDto.getBusinessHoursDay().replace("-", ",").replace("_", ",");
// String[] businessHours = businessHourStr.split(",");
// if (businessHours.length != 2) {
// log.error("checkStoreOpen businessHoursDay is invaild , businessHoursDay:{}", storeResponseDto.getBusinessHoursDay());
// throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
// }
// String startDateTimeStr = DateUtil.convert2String(new Date(), DateUtil.FORMAT_YMD) + " " + businessHours[0] + ":00";
// Date startDateTime = DateUtil.convert2Date(startDateTimeStr, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
// String endDateTimeStr = DateUtil.convert2String(new Date(), DateUtil.FORMAT_YMD) + " " + businessHours[1] + ":00";
// SimpleDateFormat hhmmss = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
// Date endDateTime;
// try {
// endDateTime = hhmmss.parse(endDateTimeStr);
// } catch (ParseException e) {
// log.error("checkStoreOpen businessHoursDay endDateTimeStr is invaild , endDateTimeStr:{}", endDateTimeStr);
// throw new ServiceException(ResponseResult.STORE_BUSINESS_HOUR_ERROR);
// }
// storeResponseDto.setBusinessHoursDayStartTime(startDateTime);
// storeResponseDto.setBusinessHoursDayEndTime(endDateTime);
// //TODO 设置门店图片
// List<StoreImagesResponseVo> storeImagesResponseVos = getStoreImages(partnerId, storeResponseDto.getStoreId(), 2);
// if (CollectionUtils.isNotEmpty(storeImagesResponseVos)) {
// storeResponseDto.setImageUrl(storeImagesResponseVos.get(0).getImageUrl());
// }
// //TODO 查询门店外卖配送信息
// OpenPlatformPartnerStoreDeliveryConfig deliveryConfig = deliveryConfigManager.findByPartnerIdAndStoreCode(partnerId, storeCode);
// storeResponseDto.setStoreDeliveryConfig(deliveryConfig);
// return storeResponseDto;
// }
/**
* 获取门店配送信息
......
......@@ -72,8 +72,8 @@ public class UserServiceImpl implements UserService {
private PartnerManager partnerManager;
// @Autowired
// private CustomerClient customerClient;
@Autowired
private StoreClient storeClient;
// @Autowired
// private StoreClient storeClient;
// @Autowired
// private ShortMessageClient shortMessageClient;
// @Autowired
......
......@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@FeignClient(name = "CustomerClient", url = "${saas.customertools.feign.url}")
@FeignClient(name = "customer-service", url = "${saas.customertools.feign.url}")
@RequestMapping(produces = {"application/json;charset=UTF-8"})
public interface MemberToolsClient {
......
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: StoreController
* @Package cn.freemud.controller
* @Description:
* @author: ping.wu
* @date: 2018/5/11 19:14
* @version V1.0
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/
package cn.freemud.service.thirdparty;
import cn.freemud.entities.dto.*;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@FeignClient(name = "CONSOLE-API",url = "${saas.storeclient.feign.url}")
@RequestMapping(produces = {"application/json;charset=UTF-8"})
public interface StoreClient {
/**
* 查询附近门店
*
* @param request
* @return
*/
@PostMapping(value = "/api/v2/organization/nearStoreList", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
StoreBaseResponseDto<StoreListResponseDto> findNearStores(@RequestBody NearStoreRequestDto request);
/**
* 查询单个门店信息
*
* @param request
* @return
*/
@PostMapping(value = "/api/v2/organization/get", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
StoreBaseResponseDto<StoreResponseDto> getStoreInfo(@RequestBody StoreInfoRequestDto request);
/**
* 查询门店轮播图
*
* @param request
* @return
*/
@PostMapping(value = "/api/v2/storeImage/list", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
StoreBaseResponseDto<StoreImageListResponseDto> findStoreImages(@RequestBody StoreImagesRequestDto request);
}
///**
// * All rights Reserved, Designed By www.freemud.cn
// *
// * @Title: StoreController
// * @Package cn.freemud.controller
// * @Description:
// * @author: ping.wu
// * @date: 2018/5/11 19:14
// * @version V1.0
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
// */
//package cn.freemud.service.thirdparty;
//
//import cn.freemud.entities.dto.*;
//import org.springframework.cloud.openfeign.FeignClient;
//import org.springframework.http.MediaType;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestBody;
//import org.springframework.web.bind.annotation.RequestMapping;
//
//@FeignClient(name = "CONSOLE-API",url = "${saas.storeclient.feign.url}")
//@RequestMapping(produces = {"application/json;charset=UTF-8"})
//public interface StoreClient {
//
// /**
// * 查询附近门店
// *
// * @param request
// * @return
// */
// @PostMapping(value = "/api/v2/organization/nearStoreList", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
// StoreBaseResponseDto<StoreListResponseDto> findNearStores(@RequestBody NearStoreRequestDto request);
//
// /**
// * 查询单个门店信息
// *
// * @param request
// * @return
// */
// @PostMapping(value = "/api/v2/organization/get", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
// StoreBaseResponseDto<StoreResponseDto> getStoreInfo(@RequestBody StoreInfoRequestDto request);
//
// /**
// * 查询门店轮播图
// *
// * @param request
// * @return
// */
// @PostMapping(value = "/api/v2/storeImage/list", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
// StoreBaseResponseDto<StoreImageListResponseDto> findStoreImages(@RequestBody StoreImagesRequestDto request);
//}
package cn.freemud.client;
import cn.freemud.entities.dto.*;
import cn.freemud.service.thirdparty.StoreClient;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.List;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: StoreClientTest
* @Package cn.freemud.client
* @Description: 测试
* @author: zhenghuan.yang
* @date: 2018/6/25 15:41
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest
@EnableDiscoveryClient
@EnableFeignClients
@EnableAutoConfiguration
public class StoreClientTest {
@Autowired
private StoreClient storeClient;
/**
* 查询附近门店
*/
@Test
public void findNearStores() {
NearStoreRequestDto nearStoreRequestDto=new NearStoreRequestDto();
nearStoreRequestDto.setPartnerId("1832");
nearStoreRequestDto.setLatitude("31.269248962402344");
nearStoreRequestDto.setLongitude("121.37284088134766");
nearStoreRequestDto.setActiveFlag("1");
nearStoreRequestDto.setTypeFlag("3");
nearStoreRequestDto.setPageNo(1);
nearStoreRequestDto.setPlaceOrderFlag("1");
nearStoreRequestDto.setPageSize(100);
nearStoreRequestDto.setDistance("100000");
StoreBaseResponseDto<StoreListResponseDto> response = storeClient.findNearStores(nearStoreRequestDto);
StoreListResponseDto storeListResponseDto=response.getBizVO();
List<StoreResponseDto> list=storeListResponseDto.getList();
log.info("storeId " + "freeDeliveryPrice "+"deliveryPrice " +"delivery" );
for (StoreResponseDto store:list){
String insert="INSERT INTO open_platform_partner_store_delivery_config (`partner_id`, `store_id`, `delivery_limit_amount`, `delivery_amount`, `default_delivery_range`, `add_range_count`, `add_range_amount`, `gmt_created`, `gmt_modified`) VALUES ('"+nearStoreRequestDto.getPartnerId()+"', '"+store.getStoreCode()+"','"+store.getFreeDeliveryPrice()*100+"','"+store.getDeliveryPrice()*100+"', '3000', '3000', '250', '2018-12-13 17:08:25', '2018-12-13 18:15:43');";
System.out.println(insert);
/* System.out.println(store.getStoreCode()+" "+store.getFreeDeliveryPrice()+" "+store.getDeliveryPrice()+" "+store.getDelivery());*/
}
}
/**
* 查询单个门店信息
*/
@Test
public void getStoreInfo() {
StoreInfoRequestDto storeInfoRequestDto=new StoreInfoRequestDto();
storeInfoRequestDto.setPartnerId("360bb48b-5316-458a-903e-9a44c7f339b1");
storeInfoRequestDto.setStoreCode("");
StoreBaseResponseDto<StoreResponseDto> storeBaseResponseDto = storeClient.getStoreInfo(storeInfoRequestDto);
log.info("storeBaseResponseDto==="+storeBaseResponseDto);
}
/**
* 查询门店轮播图
*/
@Test
public void findStoreImages() {
StoreImagesRequestDto toreImagesRequestDto=new StoreImagesRequestDto();
toreImagesRequestDto.setPartnerId("360bb48b-5316-458a-903e-9a44c7f339b1");
toreImagesRequestDto.setBusinessId("");
toreImagesRequestDto.setTypeFlag(1);
StoreBaseResponseDto<StoreImageListResponseDto> storeBaseResponseDto = storeClient.findStoreImages(toreImagesRequestDto);
log.info("storeBaseResponseDto==="+storeBaseResponseDto);
}
}
//package cn.freemud.client;
//
//import cn.freemud.entities.dto.*;
//import cn.freemud.service.thirdparty.StoreClient;
//import lombok.extern.slf4j.Slf4j;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
//import org.springframework.cloud.openfeign.EnableFeignClients;
//import org.springframework.test.context.junit4.SpringRunner;
//
//import java.util.List;
//
///**
// * All rights Reserved, Designed By www.freemud.cn
// *
// * @version V1.0
// * @Title: StoreClientTest
// * @Package cn.freemud.client
// * @Description: 测试
// * @author: zhenghuan.yang
// * @date: 2018/6/25 15:41
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
// */
//@Slf4j
//@RunWith(SpringRunner.class)
//@SpringBootTest
//@EnableDiscoveryClient
//@EnableFeignClients
//@EnableAutoConfiguration
//public class StoreClientTest {
// @Autowired
// private StoreClient storeClient;
//
// /**
// * 查询附近门店
// */
// @Test
// public void findNearStores() {
// NearStoreRequestDto nearStoreRequestDto=new NearStoreRequestDto();
// nearStoreRequestDto.setPartnerId("1832");
// nearStoreRequestDto.setLatitude("31.269248962402344");
// nearStoreRequestDto.setLongitude("121.37284088134766");
// nearStoreRequestDto.setActiveFlag("1");
// nearStoreRequestDto.setTypeFlag("3");
// nearStoreRequestDto.setPageNo(1);
// nearStoreRequestDto.setPlaceOrderFlag("1");
// nearStoreRequestDto.setPageSize(100);
// nearStoreRequestDto.setDistance("100000");
// StoreBaseResponseDto<StoreListResponseDto> response = storeClient.findNearStores(nearStoreRequestDto);
// StoreListResponseDto storeListResponseDto=response.getBizVO();
// List<StoreResponseDto> list=storeListResponseDto.getList();
// log.info("storeId " + "freeDeliveryPrice "+"deliveryPrice " +"delivery" );
// for (StoreResponseDto store:list){
// String insert="INSERT INTO open_platform_partner_store_delivery_config (`partner_id`, `store_id`, `delivery_limit_amount`, `delivery_amount`, `default_delivery_range`, `add_range_count`, `add_range_amount`, `gmt_created`, `gmt_modified`) VALUES ('"+nearStoreRequestDto.getPartnerId()+"', '"+store.getStoreCode()+"','"+store.getFreeDeliveryPrice()*100+"','"+store.getDeliveryPrice()*100+"', '3000', '3000', '250', '2018-12-13 17:08:25', '2018-12-13 18:15:43');";
// System.out.println(insert);
// /* System.out.println(store.getStoreCode()+" "+store.getFreeDeliveryPrice()+" "+store.getDeliveryPrice()+" "+store.getDelivery());*/
// }
// }
// /**
// * 查询单个门店信息
// */
// @Test
// public void getStoreInfo() {
// StoreInfoRequestDto storeInfoRequestDto=new StoreInfoRequestDto();
// storeInfoRequestDto.setPartnerId("360bb48b-5316-458a-903e-9a44c7f339b1");
// storeInfoRequestDto.setStoreCode("");
// StoreBaseResponseDto<StoreResponseDto> storeBaseResponseDto = storeClient.getStoreInfo(storeInfoRequestDto);
// log.info("storeBaseResponseDto==="+storeBaseResponseDto);
// }
// /**
// * 查询门店轮播图
// */
// @Test
// public void findStoreImages() {
// StoreImagesRequestDto toreImagesRequestDto=new StoreImagesRequestDto();
// toreImagesRequestDto.setPartnerId("360bb48b-5316-458a-903e-9a44c7f339b1");
// toreImagesRequestDto.setBusinessId("");
// toreImagesRequestDto.setTypeFlag(1);
// StoreBaseResponseDto<StoreImageListResponseDto> storeBaseResponseDto = storeClient.findStoreImages(toreImagesRequestDto);
// log.info("storeBaseResponseDto==="+storeBaseResponseDto);
// }
//}
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