盲袋详情

ch-core/src/main/java/com/wwdz/ch/core/entity/ImageInfo.java

@@ -6,12 +6,26 @@ import lombok.Data;
 @Data
 public class ImageInfo implements Entity {
 
-    private int height;
+    private Integer height;
 
-    private int width;
+    private Integer width;
 
 
     public String formartString() {
         return this.width + "x" + this.height;
     }
+
+
+    private String url;
+
+    /**
+     * 1视频
+     * 2图片
+     */
+    private Integer type;
+
+    /**
+     * 视频url
+     */
+    private String videoUrl;
 }

ch-core/src/main/java/com/wwdz/ch/core/util/MediaUtil.java

@@ -20,9 +20,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 public class MediaUtil {
 
@@ -163,6 +161,53 @@ public class MediaUtil {
 
 
 
+    /**
+     * 分号拼接的图片url转成list，带宽高参数
+     * type 1视频  2图片
+     * @param images
+     * @return
+     */
+    public static List<ImageInfo> convertImage(String images, String videos) {
+        List<ImageInfo> imageInfos = new ArrayList<>();
+        if (StringUtils.hasLength(videos)) {
+            List<String> videoList = Arrays.asList(videos.split(";"));
+            for (String video : videoList) {
+                String[] arr = video.split(",");
+                if (arr.length > 1) {
+                    try {
+                        String videoUrl = arr[0];
+                        String videoImg = arr[1];
+                        Map<String, Object> map = getAspect(videoImg);
+                        String width = map.get("width").toString();
+                        String height = map.get("height").toString();
+                        ImageInfo imageInfo = new ImageInfo();
+                        imageInfo.setType(1);
+                        imageInfo.setUrl(videoImg);
+                        imageInfo.setVideoUrl(videoUrl);
+                        imageInfo.setWidth(Integer.valueOf(width));
+                        imageInfo.setHeight(Integer.valueOf(height));
+                        imageInfos.add(imageInfo);
+                    } catch (Exception e) {
+                        logger.error("视频字段转换imageInfo error:{}", e);
+                    }
+                }
+            }
+        }
+        List<String> imageList = Arrays.asList(images.split(";"));
+        for (String image : imageList) {
+            Map<String, Object> map = getAspect(image);
+            String width = map.get("width").toString();
+            String height = map.get("height").toString();
+            ImageInfo imageInfo = new ImageInfo();
+            imageInfo.setType(2);
+            imageInfo.setUrl(image);
+            imageInfo.setWidth(Integer.valueOf(width));
+            imageInfo.setHeight(Integer.valueOf(height));
+            imageInfos.add(imageInfo);
+        }
+        return imageInfos;
+    }
+
 
 
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/BlindBoxDetailVo.java

 package com.wwdz.ch.wx.entity.vo.distribution;
 
+import com.wwdz.ch.core.entity.ImageInfo;
 import com.xxdxxs.entity.Entity;
 import lombok.Data;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 @Data
 public class BlindBoxDetailVo implements Entity {
@@ -25,6 +24,11 @@ public class BlindBoxDetailVo implements Entity {
      */
     List<ItemSkuVo> itemSkuVoList;
 
+    /**
+     * 盲袋图片视频集合
+     */
+    private List<ImageInfo> imageInfoList;
+
     /**
      * 福袋视频
      */
@@ -54,4 +58,9 @@ public class BlindBoxDetailVo implements Entity {
      * 盲袋购买记录
      */
     private List<BlindBoxBuyRecordVo> buyRecordList;
+
+    /**
+     * 购买进度
+     */
+    private String rate;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/BlindBoxServiceImpl.java

@@ -5,6 +5,7 @@ import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.consts.DistributionEnum;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.CacheUtil;
+import com.wwdz.ch.core.util.MediaUtil;
 import com.wwdz.ch.core.util.PriceUtil;
 import com.wwdz.ch.core.util.StringUtil;
 import com.wwdz.ch.db.dao.distribution.DistributionOrderDao;
@@ -176,11 +177,12 @@ public class BlindBoxServiceImpl implements BlindBoxService {
             if (StringUtils.hasLength(supplierItem.getVideos())) {
                 blindBoxDetailVo.setVideos(Arrays.asList(supplierItem.getVideos().split(";")));
             }
+            blindBoxDetailVo.setImageInfoList(MediaUtil.convertImage(supplierItem.getImages(), supplierItem.getVideos()));
             blindBoxDetailVo.setName(supplierItem.getName());
             blindBoxDetailVo.setPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
             blindBoxDetailVo.setTotalNum(pageInfo.getTotal());
             blindBoxDetailVo.setRemainNum(supplierItem.getStock().longValue() < 0 ? 0 : supplierItem.getStock().longValue());
-
+            blindBoxDetailVo.setRate(String.valueOf(Math.ceil(blindBoxDetailVo.getRemainNum() / pageInfo.getTotal())));
             //查询购买记录
             //盲袋的编码
             List<String> codes = new ArrayList<>();