修改 小程序价格和收藏数

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

@@ -18,7 +18,7 @@ public class ItemResponseVo implements Entity {
     private Integer sourceType;
     private Integer isCollected;
     private Long favoritesId;
-    private long collectCount;
+    private String collectCount;
     private Integer isMine;
     private String createTime;
     private String videos;

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

@@ -265,7 +265,11 @@ public class FavoritesServiceImpl implements FavoritesService {
                 if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) {
                     count --;
                 }
-                vo.setCollectCount(count);
+                if (count < 1000) {
+                    vo.setCollectCount(String.valueOf(count));
+                } else {
+                    vo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
+                }
 
                 AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
                 agentTranceResponseVo.setAgentTraceInfo_("");

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

@@ -77,7 +77,15 @@ 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()));
+                long count = favoritesItemsRelationDao.countByItemId(item.getId());
+                if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) {
+                    count --;
+                }
+                if (count < 1000) {
+                    itemResponseVo.setCollectCount(String.valueOf(count));
+                } else {
+                    itemResponseVo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
+                }
                 if (footprint.getAddTime().compareTo(today) >= 0) {
                     todayList.add(itemResponseVo);
                 }
@@ -162,14 +170,22 @@ public class FootPrintServiceImpl implements FootPrintService {
                 itemResponseVo.setName(item.getName());
                 itemResponseVo.setImages(item.getImages());
                 itemResponseVo.setDetail(item.getDetail());
+                if (item.getPrice() % 100 == 0) {
                     itemResponseVo.setPrice(String.valueOf(item.getPrice() / 100));
+                } else {
+                    itemResponseVo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100));
+                }
                 itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), footprint.getItemId()) ? 1 : 0);
                 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 (count < 1000) {
+                    itemResponseVo.setCollectCount(String.valueOf(count));
+                } else {
+                    itemResponseVo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
+                }
                 if (footprint.getAddTime().compareTo(today) >= 0) {
                     todayList.add(itemResponseVo);
                 }

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

@@ -93,7 +93,11 @@ public class ItemServiceImpl implements ItemService {
                 ItemResponseVo vo = new ItemResponseVo();
                 vo.setId(item.getId());
                 vo.setName(item.getName());
+                if (item.getPrice() % 100 == 0) {
                     vo.setPrice(String.valueOf(item.getPrice() / 100));
+                } else {
+                    vo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100));
+                }
                 vo.setDetail(item.getDetail());
                 vo.setIsCollected(0);
                 vo.setIsMine(0);
@@ -129,7 +133,11 @@ public class ItemServiceImpl implements ItemService {
                 if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) {
                     count --;
                 }
-                vo.setCollectCount(count);
+                if (count < 1000) {
+                    vo.setCollectCount(String.valueOf(count));
+                } else {
+                    vo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
+                }
                 vo.setSourceType(item.getSourceType());
 
                 AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
@@ -219,7 +227,11 @@ public class ItemServiceImpl implements ItemService {
             if (Objects.nonNull(category)) {
                 itemResponseVo.setCategoryName(category.getName());
             }
+            if (item.getPrice() % 100 == 0) {
                 itemResponseVo.setPrice(String.valueOf(item.getPrice() / 100));
+            } else {
+                itemResponseVo.setPrice(String.valueOf(item.getPrice().doubleValue() / 100));
+            }
             itemResponseVo.setSourceType(item.getSourceType());
             itemResponseVo.setCreateTime(DateUtils.toString(item.getCreateTime()));
             itemResponseVo.setIsCollected(0);
@@ -294,7 +306,7 @@ public class ItemServiceImpl implements ItemService {
                 return Result.failed("您尚未登录，请先登录");
             }
             if (userItemsRelationDao.isExisted(dto.getUserId(), dto.getId())) {
-                return Result.failed("操作失败，无法取消收藏");
+                return Result.failed("自己发布的藏品不能取消收藏");
             }
 
             // 删除藏品和收藏册关联

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

@@ -101,7 +101,7 @@ public class WxItemController {
             return Result.failed("标题不能为空");
         }
         if (StringUtils.isBlank(images)) {
-            return Result.failed("图片不能为空");
+            return Result.failed("请至少上传一张图片");
         }
         if (StringUtils.isBlank(favoritesId)) {
             return Result.failed("收藏册id不能为空");
@@ -149,7 +149,7 @@ public class WxItemController {
             return Result.failed("标题不能为空");
         }
         if (StringUtils.isBlank(images)) {
-            return Result.failed("图片不能为空");
+            return Result.failed("请至少上传一张图片");
         }
         if (StringUtils.isBlank(favoritesId)) {
             return Result.failed("收藏册id不能为空");