修改 小程序藏品首页、详情

ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WxWebMvcConfiguration.java

@@ -30,6 +30,6 @@ public class WxWebMvcConfiguration implements WebMvcConfigurer {
 		registry.addInterceptor(loginInterceptor())
 				.addPathPatterns("/**")
 				.excludePathPatterns("/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/wx/user/loginByWx"
-						, "/wx/user/loginByMobile", "/wx/user/loginRegCaptcha", "/wx/user/updateRegCaptcha");
+						, "/wx/user/loginByMobile", "/wx/user/loginRegCaptcha", "/wx/user/updateRegCaptcha", "/wx/item/page", "/wx/item/info");
 	}
 }

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

@@ -63,7 +63,10 @@ public class ItemServiceImpl implements ItemService {
                 vo.setImages(item.getImages());
                 vo.setPrice(String.valueOf(item.getPrice() * 100));
                 vo.setDetail(item.getDetail());
+                vo.setIsCollected(0);
+                if (!dto.getUserId().equals(0L)) {
                     vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), item.getId()) ? 1 : 0);
+                }
                 long count = favoritesItemsRelationDao.countByItemId(item.getId());
                 if (item.getSourceType().equals(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode())) {
                     count --;
@@ -154,6 +157,9 @@ public class ItemServiceImpl implements ItemService {
             }
             itemResponseVo.setPrice(String.valueOf(item.getPrice() * 100));
             itemResponseVo.setSourceType(item.getSourceType());
+            itemResponseVo.setIsCollected(0);
+            itemResponseVo.setIsMine(0);
+            if (!dto.getUserId().equals(0L)) {
                 FavoritesItemsRelation favoritesItemsRelation = favoritesItemsRelationDao.selectByUserIdItemId(dto.getUserId(), item.getId());
                 if (Objects.nonNull(favoritesItemsRelation)) {
                     itemResponseVo.setIsCollected(1);
@@ -162,6 +168,7 @@ public class ItemServiceImpl implements ItemService {
                     itemResponseVo.setIsCollected(0);
                 }
                 itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
+            }
             logger.info("【请求结束】查看藏品详情成功");
             return Result.success(itemResponseVo);
         } catch (Exception e) {
@@ -236,7 +243,7 @@ public class ItemServiceImpl implements ItemService {
             return Result.success();
         } catch (Exception e) {
             logger.error("修改藏品失败，原因：" + e.getMessage(), e);
-            return Result.failed("收藏藏品失败");
+            return Result.failed("修改藏品失败");
         }
     }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/interceptor/LoginInterceptor.java

@@ -30,6 +30,7 @@ public class LoginInterceptor implements HandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         logger.info("-------------进入拦截器");
         String token = request.getHeader("kl_token");
+        logger.info("token的值是：" + token);
         if (StringUtils.isBlank(token)) {
             return true;
         }

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

@@ -31,9 +31,6 @@ public class WxItemController {
         String userId = JsonUtils.getValueByPath(json, "userId");
         String page = JsonUtils.getValueByPath(json, "page");
         String size = JsonUtils.getValueByPath(json, "size");
-        if (StringUtils.isBlank(userId)) {
-            return Result.failed("用户id不能为空");
-        }
         if (StringUtils.isBlank(page)) {
             return Result.failed("当前页不能为空");
         }
@@ -42,7 +39,10 @@ public class WxItemController {
         }
 
         ItemRequestDto dto = new ItemRequestDto();
+        dto.setUserId(0L);
+        if (StringUtils.isNotBlank(userId)) {
             dto.setUserId(Long.parseLong(userId));
+        }
         dto.setPage(Integer.parseInt(page));
         dto.setSize(Integer.parseInt(size));
         return itemService.page(dto);
@@ -150,15 +150,15 @@ public class WxItemController {
         logger.info("【请求开始】藏品详情查询,请求参数,kl_data:{}", json);
         String userId = JsonUtils.getValueByPath(json, "userId");
         String id = JsonUtils.getValueByPath(json, "id");
-//        if (StringUtils.isBlank(userId)) {
-//            return Result.failed("用户id不能为空");
-//        }
         if (StringUtils.isBlank(id)) {
             return Result.failed("当前页不能为空");
         }
 
         ItemRequestDto dto = new ItemRequestDto();
+        dto.setUserId(0L);
+        if (StringUtils.isNotBlank(userId)) {
             dto.setUserId(Long.parseLong(userId));
+        }
         dto.setId(Long.parseLong(id));
         return itemService.info(dto);
     }