Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/AuditApiServiceImpl.java

@@ -130,10 +130,7 @@ public class AuditApiServiceImpl implements AuditApiService{
 			storeService.saveOrUpdateStore(store);
 		 }else{
 			 //门店图片修改
-			 List<StorePhotoDTO> oldStorePhoto = JSONObject.parseArray(oldValue, StorePhotoDTO.class);
-			 List<StorePhotoDTO> newStorePhoto = JSONObject.parseArray(newValue, StorePhotoDTO.class);
-			 List<String> delPhotos = oldStorePhoto.stream().map(s->s.getImageFiledCode()).collect(Collectors.toList());
-			 storeService.editStoreImage( storeId, newStorePhoto,  delPhotos);
+			 storeService.updateStorePhotos(storeId, newValue);
 		 }		
 	}
 	void getStoreDTO(StoreDTO store,String changeField,String oldValue,String newValue){

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

@@ -227,7 +227,7 @@ public class StoreController extends WebBaseController{
 
         return resultResponse(HaoBanErrCode.ERR_8);
 	}
-	//获取首页销售数据
+	//修改门店数据
 	@RequestMapping("/change-store-detail")
 	public HaobanResponse saleDate(String wxEnterpriseId,String storeId,String staffId,String changeField,String oldValue,String newValue) {
 		if(StringUtils.isAnyBlank(wxEnterpriseId,storeId,changeField,oldValue,newValue)){
@@ -260,7 +260,7 @@ public class StoreController extends WebBaseController{
 		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());
+			List<String> imgList = imgDTOList.stream().map(s->s.getQcloudImageUrl()).collect(Collectors.toList());
 			vo.setImgList(imgList);
 		}
 		SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");