Merge remote-tracking branch 'origin/developerA' into developerA

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -271,16 +271,18 @@ public class ClubServiceImpl implements ClubService {
 //        0未买过，-1过期，1有效
         if (vip == null) {
             vipDto.setVipFlag(0);
-        }else {
+        } else {
             vipDto.setEndTime(vip.getEndTime());
             SuperVipPo endTime = vipMapper.findEndTime(userId);
-            String format = new SimpleDateFormat("yyyy-MM-dd").format(endTime.getEndTime());
-            vipDto.setTime(format);
             //不为空则有效期内
-            if(endTime!=null){
+            if (endTime != null) {
                 vipDto.setVipFlag(1);
-            }else {
+                String format = new SimpleDateFormat("yyyy-MM-dd").format(endTime.getEndTime());
+                vipDto.setTime(format);
+            } else {
                 vipDto.setVipFlag(-1);
+                String format = new SimpleDateFormat("yyyy-MM-dd").format(vip.getEndTime());
+                vipDto.setTime(format);
             }
         }
         map.put("vip", vipDto);
@@ -358,14 +360,14 @@ public class ClubServiceImpl implements ClubService {
 
     /**
      * 保存机构资料备注
-     * @param jsonParamsDto:{
-     *                     remarksId:           备注id,
-     *                     机构id:               机构id,
-     *                     serviceProviderId:   协销id,
-     *                     remarks:             文字备注,
-     *                     fileList:    [{fileName:"文件名称",ossName:"oss文件名称"},{fileName:"文件名称",ossName:"oss文件名称"}...]
-     *                     imageList:   ["图片","图片",...]
-     *                    }
+     *
+     * @param jsonParamsDto:{ remarksId:           备注id,
+     *                        机构id:               机构id,
+     *                        serviceProviderId:   协销id,
+     *                        remarks:             文字备注,
+     *                        fileList:    [{fileName:"文件名称",ossName:"oss文件名称"},{fileName:"文件名称",ossName:"oss文件名称"}...]
+     *                        imageList:   ["图片","图片",...]
+     *                        }
      * @return
      */
     @Override
@@ -403,7 +405,7 @@ public class ClubServiceImpl implements ClubService {
             remarksId = clubRemarksPo.getRemarksId();
             //保存图片
             if (!imagesArray.isEmpty()) {
-                for (Object imageObj: imagesArray) {
+                for (Object imageObj : imagesArray) {
                     String image = String.valueOf(imageObj);
                     // 保存资质图片
                     clubMapper.insertRemarksImage(remarksId, image);
@@ -411,7 +413,7 @@ public class ClubServiceImpl implements ClubService {
             }
             //保存文件
             if (!filesArray.isEmpty()) {
-                for (Object fileObj: filesArray) {
+                for (Object fileObj : filesArray) {
                     JSONObject file = (JSONObject) fileObj;
                     String fileName = file.getString("fileName");
                     String ossName = file.getString("ossName");
@@ -446,8 +448,9 @@ public class ClubServiceImpl implements ClubService {
         RemarksVo remarksVo = clubMapper.getRemarks(remarksId);
         List<String> imageList = clubMapper.getRemarksImageList(remarksId);
         List<RemarksFileVo> fileList = clubMapper.getRemarksFileList(remarksId);
-        fileList.forEach(file->{
-            file.setFileUrl(OssUtil.getOssUrl(file.getOssName())); ;
+        fileList.forEach(file -> {
+            file.setFileUrl(OssUtil.getOssUrl(file.getOssName()));
+            ;
         });
         remarksVo.setImageList(imageList);
         remarksVo.setFileList(fileList);
@@ -462,7 +465,7 @@ public class ClubServiceImpl implements ClubService {
         clubMapper.deleteRemarks(remarksId);
         //删除oss服务器上的文件
         List<RemarksFileVo> fileList = clubMapper.getRemarksFileList(remarksId);
-        fileList.forEach(file->{
+        fileList.forEach(file -> {
             OssUtil.deleteSingleFile(file.getOssName());
         });
         //删除备注包含的文件