Merge remote-tracking branch 'origin/dev_20211205' into dev_20211205

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/poster/SweetStrawListParam.java

-package com.liquidnet.service.sweet.dto.param.poster;
+/*package com.liquidnet.service.sweet.dto.param.poster;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,4 +17,4 @@ public class SweetStrawListParam implements Serializable {
     @NotBlank(message = "lineupNum不能为空")
     private List<SweetStrawMusicianParam> lineup;
 
-}
+}*/

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/poster/SweetStrawberryParam.java

@@ -41,11 +41,11 @@ public class SweetStrawberryParam implements Serializable {
     private String customText;
 
     @Valid
-    @ApiModelProperty(value = "阵容列表", example = "[{\"lineup\":[{\"lineupNum\":\"lineup1\",\"musicianName\":\"歌手1\"},\n" +
-            "{\"lineupNum\":\"lineup1\",\"musicianName\":\"歌手D\"}]},\n" +
-            "{\"lineup\":[{\"lineupNum\":\"lineup2\",\"musicianName\":\"歌手2\"}]}]")
+    @ApiModelProperty(value = "阵容列表", example = "[{\"lineupNum\": \"lineup1\",\"musicianId\": 9999,\"musicianName\": \"歌手1\"},\n" +
+            " {\"lineupNum\": \"lineup1\",\"musicianId\": 23233,\"musicianName\": \"歌手D\"},\n" +
+            " {\"lineupNum\": \"lineup2\",\"musicianId\": 1111,\"musicianName\": \"歌手2\"}]")
     @NotNull(message = "musicianList")
-    private List<SweetStrawListParam> musicianList;
+    private List<SweetStrawMusicianParam> musicianList;
 
     private static final SweetStrawberryParam obj = new SweetStrawberryParam();
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetStrawberryPosterServiceImpl.java

@@ -6,7 +6,6 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.sweet.dto.param.poster.SweetStrawListParam;
 import com.liquidnet.service.sweet.dto.param.poster.SweetStrawMusicianParam;
 import com.liquidnet.service.sweet.dto.param.poster.SweetStrawberryParam;
 import com.liquidnet.service.sweet.entity.SweetStrawberryPoster;
@@ -54,10 +53,8 @@ public class SweetStrawberryPosterServiceImpl extends ServiceImpl<SweetStrawberr
         String cityCode=sweetStrawberry.getCityCode();
         String cityName=sweetStrawberry.getCityName();
         String customText = sweetStrawberry.getCustomText();
-        List<SweetStrawListParam> musicianList = sweetStrawberry.getMusicianList();
-        for (SweetStrawListParam sweetStrawListParam : musicianList) {
-            List<SweetStrawMusicianParam> lineup = sweetStrawListParam.getLineup();
-            for (SweetStrawMusicianParam param : lineup) {
+        List<SweetStrawMusicianParam> musicianList = sweetStrawberry.getMusicianList();
+            for (SweetStrawMusicianParam param : musicianList) {
                 String lineupNum = param.getLineupNum();
                 String musicianName = param.getMusicianName();
                 String lineupId=IDGenerator.nextSnowId();
@@ -68,7 +65,7 @@ public class SweetStrawberryPosterServiceImpl extends ServiceImpl<SweetStrawberr
                 sqlsDataA.add(new Object[]{lineupId, posterId,lineupNum, musicianName,localDateTime,null});
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_POSTER.getKey(), SqlMapping.gets(sqls, sqlsDataA));
             }
-        }
+
 
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();