Commit b979ffc7 by guojuxing

门店呢查询接口,添加门店标签入参查询

parent ad21a793
......@@ -81,6 +81,10 @@ public class StoreController extends DownloadUtils {
private WeixinWxaFunService weixinWxaFunService;
@Autowired
private DownloadReportApiService downloadReportApiService;
@Autowired
private StoreTagApiService storeTagApiService;
@Autowired
private StoreWidgetApiService storeWidgetApiService;
private Map<Integer, SimpleDateFormat> map = new ConcurrentHashMap<>();
private Map<Integer, SimpleDateFormat> map1 = new ConcurrentHashMap<>();
......@@ -134,7 +138,7 @@ public class StoreController extends DownloadUtils {
}
@RequestMapping("/store-list")
public RestResponse storeList(@RequestBody StoreSearchDTO storeSearchDTO) {
public RestResponse storeList(@RequestBody StoreSearchDTO storeSearchDTO, Integer storeTagId) {
logger.info("查询条件:{}", JSON.toJSONString(storeSearchDTO));
Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
Integer userId = UserDetailUtils.getUserDetail().getUserId();
......@@ -142,6 +146,13 @@ public class StoreController extends DownloadUtils {
if(UserDetailUtils.getUserDetail().getUserResourceInfo() != null){
storeSearchDTO.setStoreResource(UserDetailUtils.getUserDetail().getUserResourceInfo().getStoreResource());
}
//门店标签
ServiceResponse<StoreTagDTO> storeTagResult = storeTagApiService.getByStoreTagId(storeTagId);
if (storeTagResult.isSuccess()) {
storeSearchDTO.setStoreResource(Long.parseLong(storeTagResult.getResult().getStoreWidgetId().toString()));
}
String key = StoreRedisKeyUtils.getStoreListSourceKey(enterpriseId, userId);
Object obj = RedisUtil.getCache(key);
String returnFileds = StoreESFieldsEnum.STOREID.getField();
......
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