修改 小程序首页和发布

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

 package com.wwdz.ch.wx.impl;
 
+import com.wwdz.ch.core.consts.CommonEnum;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.FavoritesItemsRelationDao;
 import com.wwdz.ch.db.dao.FootPrintDao;
 import com.wwdz.ch.db.dao.ItemDao;
+import com.wwdz.ch.db.dao.UserItemsRelationDao;
 import com.wwdz.ch.db.domain.Footprint;
 import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.wx.entity.request.FootPrintRequestDto;
@@ -31,6 +33,8 @@ public class FootPrintServiceImpl implements FootPrintService {
     private ItemDao itemDao;
     @Autowired
     private FavoritesItemsRelationDao favoritesItemsRelationDao;
+    @Autowired
+    private UserItemsRelationDao userItemsRelationDao;
 
     @Override
     public Result listAll(FootPrintRequestDto dto) {
@@ -160,7 +164,12 @@ public class FootPrintServiceImpl implements FootPrintService {
                 itemResponseVo.setDetail(item.getDetail());
                 itemResponseVo.setPrice(String.valueOf(item.getPrice() / 100));
                 itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), footprint.getItemId()) ? 1 : 0);
-                itemResponseVo.setCollectCount(favoritesItemsRelationDao.countByItemId(footprint.getItemId()));
+                itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
+                long count = favoritesItemsRelationDao.countByItemId(item.getId());
+                if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) {
+                    count --;
+                }
+                itemResponseVo.setCollectCount(count);
                 if (footprint.getAddTime().compareTo(today) >= 0) {
                     todayList.add(itemResponseVo);
                 }

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

@@ -93,9 +93,10 @@ public class ItemServiceImpl implements ItemService {
                 ItemResponseVo vo = new ItemResponseVo();
                 vo.setId(item.getId());
                 vo.setName(item.getName());
-                vo.setPrice(String.valueOf(item.getPrice() * 100));
+                vo.setPrice(String.valueOf(item.getPrice() / 100));
                 vo.setDetail(item.getDetail());
                 vo.setIsCollected(0);
+                vo.setIsMine(0);
                 vo.setImages(item.getImages());
                 Map<String, Object> homePageMap = new HashMap<>();
                 if (StringUtils.isNotBlank(item.getVedios())) {
@@ -112,6 +113,11 @@ public class ItemServiceImpl implements ItemService {
                         homePageMap = getImageMap(image[0]);
                         homePageMap.put("url", image[0]);
                         homePageMap.put("type", 2);
+                    } else {
+                        homePageMap.put("type", 2);
+                        homePageMap.put("url", image[0]);
+                        homePageMap.put("width", "0");
+                        homePageMap.put("height", "0");
                     }
                 }
                 vo.setHomePageImage(homePageMap);

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxFootprintController.java

@@ -145,16 +145,6 @@ public class WxFootprintController {
 			return Result.failed("页面大小不能为空");
 		}
 
-		if (StringUtils.isBlank(userId)) {
-			return Result.failed("用户id不能为空");
-		}
-		if (StringUtils.isBlank(page)) {
-			return Result.failed("当前页不能为空");
-		}
-		if (StringUtils.isBlank(size)) {
-			return Result.failed("页面大小不能为空");
-		}
-
 		FootPrintRequestDto dto = new FootPrintRequestDto();
 		dto.setUserId(Long.parseLong(userId));
 		dto.setPage(Integer.parseInt(page));

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxItemController.java

@@ -100,9 +100,6 @@ public class WxItemController {
         if (StringUtils.isBlank(name)) {
             return Result.failed("标题不能为空");
         }
-        if (StringUtils.isBlank(price)) {
-            return Result.failed("价格不能为空");
-        }
         if (StringUtils.isBlank(images)) {
             return Result.failed("图片不能为空");
         }
@@ -118,6 +115,9 @@ public class WxItemController {
         dto.setFavoritesId(Long.parseLong(favoritesId));
         dto.setImages(images);
         dto.setVideos(videos);
+        if (StringUtils.isBlank(price)) {
+            price = "0";
+        }
         dto.setPrice(price);
         return itemService.add(dto);
     }
@@ -148,9 +148,6 @@ public class WxItemController {
         if (StringUtils.isBlank(name)) {
             return Result.failed("标题不能为空");
         }
-        if (StringUtils.isBlank(price)) {
-            return Result.failed("价格不能为空");
-        }
         if (StringUtils.isBlank(images)) {
             return Result.failed("图片不能为空");
         }
@@ -167,6 +164,9 @@ public class WxItemController {
         dto.setFavoritesId(Long.parseLong(favoritesId));
         dto.setImages(images);
         dto.setVideos(videos);
+        if (StringUtils.isBlank(price)) {
+            price = "0";
+        }
         dto.setPrice(price);
         return itemService.update(dto);
     }