Commit defd7618 by 陶光胜

观云台小程序

parent 68025b48
...@@ -204,13 +204,13 @@ public class StoreWidgetController { ...@@ -204,13 +204,13 @@ public class StoreWidgetController {
} }
@RequestMapping("on-store-list") @RequestMapping("on-store-list")
public RestResponse onStoreList(Integer userId, Integer enterrpiseId, Integer type){ public RestResponse onStoreList(Integer userId, Integer enterpriseId, Integer type){
OnLineAuth onlineStore = this.dataAuthUtils.getOnlineStore(userId, enterrpiseId); OnLineAuth onlineStore = this.dataAuthUtils.getOnlineStore(userId, enterpriseId);
if(onlineStore.isHasAuth()){ if(onlineStore.isHasAuth()){
List<OnLineStore> list = onlineStore.getList(); List<OnLineStore> list = onlineStore.getList();
for(OnLineStore store : list){ for(OnLineStore store : list){
if(type == store.getChannel()){ if(type == store.getChannel()){
List<OnLineStoreVo> onLineStoreVos = this.listOnLineStore(store.getStoreIdList(), type, enterrpiseId); List<OnLineStoreVo> onLineStoreVos = this.listOnLineStore(store.getStoreIdList(), type, enterpriseId);
log.info("on-store-list:{}, {}", JSON.toJSONString(onLineStoreVos), JSON.toJSONString(store.getStoreIdList())); log.info("on-store-list:{}, {}", JSON.toJSONString(onLineStoreVos), JSON.toJSONString(store.getStoreIdList()));
return RestResponse.success(onLineStoreVos); return RestResponse.success(onLineStoreVos);
} }
...@@ -362,7 +362,7 @@ public class StoreWidgetController { ...@@ -362,7 +362,7 @@ public class StoreWidgetController {
for(StoreDictDTO dictDTO : result){ for(StoreDictDTO dictDTO : result){
StoreTypeVo storeTypeVo = new StoreTypeVo(); StoreTypeVo storeTypeVo = new StoreTypeVo();
if(CollectionUtils.isNotEmpty(exists)){ if(CollectionUtils.isNotEmpty(exists)){
if(exists.contains(dictDTO.getValue())){ if(exists.contains(Integer.valueOf(dictDTO.getValue()))){
storeTypeVo.setId(dictDTO.getValue()); storeTypeVo.setId(dictDTO.getValue());
storeTypeVo.setName(dictDTO.getKey()); storeTypeVo.setName(dictDTO.getKey());
list.add(storeTypeVo); list.add(storeTypeVo);
......
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