1111

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

 package com.gic.haoban.manage.web.controller;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -135,8 +136,20 @@ public class StoreController extends WebBaseController{
 		if(StringUtils.isAnyBlank(storeId)){
 			return resultResponse(HaoBanErrCode.ERR_2);
 		}
+		List<StorePhotoDTO> imgDTOList = storeService.getStoreImages(storeId);
 		StoreDTO store = storeService.getStore(storeId);
 		StoreDetailVO vo = EntityUtil.changeEntity(StoreDetailVO.class, store);
+		if(CollectionUtil.isNotEmpty(imgDTOList)){
+			List<String> imgList = imgDTOList.stream().map(s->s.getImageUrl()).collect(Collectors.toList());
+			vo.setImgList(imgList);
+		}
+		SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+		if(vo.getOpenTime()!=null){
+			vo.setOpenTimeStr(sdf.format(vo.getOpenTime()));
+		}
+		if(vo.getCloseTime()!=null){
+			vo.setCloseTimeStr(sdf.format(vo.getCloseTime()));
+		}
 		return resultResponse(HaoBanErrCode.ERR_1,vo);
 	}
 	

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StoreDetailVO.java

@@ -31,7 +31,7 @@ public class StoreDetailVO implements Serializable {
 
     private String clerkId;
 
-    private String imageUrl;
+    private List<String> imgList;
     private String storeImage;
 
     private Double storeArea;
@@ -156,12 +156,14 @@ public class StoreDetailVO implements Serializable {
 		this.clerkId = clerkId;
 	}
 
-	public String getImageUrl() {
-		return imageUrl;
+
+
+	public List<String> getImgList() {
+		return imgList;
 	}
 
-	public void setImageUrl(String imageUrl) {
-		this.imageUrl = imageUrl;
+	public void setImgList(List<String> imgList) {
+		this.imgList = imgList;
 	}
 
 	public String getStoreImage() {