sweet

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java

@@ -217,10 +217,43 @@ public class SweetAppletController {
     @GetMapping("artistsDetails")
     @ApiOperation("艺人-详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true)
+            @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true)
     })
-    public ResponseDto<SweetArtists> artistsDetails(@RequestParam String artistsId) {
-        return ResponseDto.success(redisDataUtils.getArtistsDetails(artistsId));
+    public ResponseDto<SweetManualArtistListDto> artistsDetails(@RequestParam String artistsId,
+                                                                @RequestParam String manualId,
+                                                                @RequestParam String uid) {
+        SweetManualArtistList2Dto data = redisDataUtils.getTimeList(manualId);
+        List<SweetManualArtistListDto> dataList = data.getData();
+        SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid);
+
+        SweetManualArtistListDto vo = SweetManualArtistListDto.getNew();
+        for (SweetManualArtistListDto item : dataList) {
+            if (item.getArtistId().equalsIgnoreCase(artistsId)) {
+                item.setIsWatch(0);
+                item.setIsSign(0);
+                if (relationData.getWatchList() != null) {
+                    for (String artistsIds : relationData.getWatchList()) {
+                        if (artistsId.equalsIgnoreCase(artistsIds)) {
+                            item.setIsWatch(1);
+                            break;
+                        }
+                    }
+                }
+                if (relationData.getSignList() != null) {
+                    for (String artistsIds : relationData.getSignList()) {
+                        if (artistsId.equalsIgnoreCase(artistsIds)) {
+                            item.setIsSign(1);
+                            break;
+                        }
+                    }
+                }
+                vo = item;
+                break;
+            }
+        }
+        return ResponseDto.success(vo);
     }
 
     @GetMapping("manualShop")