Merge branch 'dev' into test

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java

@@ -473,7 +473,7 @@ public class DataImpl {
 
             Class.forName(driverClassName); //执行驱动
             con = DriverManager.getConnection(url, username, password); //获取连接
-            String sqlAllCount = "select count(0) as 'allCount' from order_tickets where performance_id  > 5721 and status != 2 and status != -1 and created_at like '2021-" + month + "%'"; //设置的预编译语句格式
+            String sqlAllCount = "select count(0) as 'allCount' from order_tickets where performance_id  > 5721 and status != 2 and status != -1 and created_at like '2020-" + month + "%'"; //设置的预编译语句格式
 //            String sqlAllCount = "select count(0) as 'allCount' from order_tickets where performance_id = "+month + " and status != 2 and status !=-1"; //设置的预编译语句格式
             pstmt = con.prepareStatement(sqlAllCount);
             ResultSet allCount = pstmt.executeQuery();

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

@@ -73,8 +73,8 @@ public class SweetAppletController {
     @ApiOperation("时间表")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "dateTime", value = "时间 全部传 \"\"", required = false),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "stage", value = "舞台 全部传 \"\"", required = false),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "dateTime", value = "时间 全部不传", required = false),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "stage", value = "舞台 全部不传", required = false),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "isSign", value = "是否签名(1是0否)", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = false),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = false),
@@ -103,7 +103,7 @@ public class SweetAppletController {
             endPosition = (page) * size;
         }
 
-        if (page != null && dateTime==null) {
+        if (page == null && dateTime == null) {
             try {
                 dateTime = data.getDate().get(0);
             } catch (Exception e) {
@@ -112,25 +112,25 @@ public class SweetAppletController {
         }
 
         for (SweetManualArtistListDto item : artistData) {
-            boolean isSave = false;
+            boolean isSave = true;
             if (isSign == 1) {
-                if (item.getSignatureStart() != null) {
-                    //保留
-                    isSave = true;
+                if (item.getSignatureStart() == null) {
+                    //不保留
+                    isSave = false;
                 }
             }
 
-            if (dateTime!=null) {
-                if (item.getPerformanceStart().contains(dateTime)) {
-                    //保留
-                    isSave = true;
+            if (dateTime != null) {
+                if (!item.getPerformanceStart().contains(dateTime)) {
+                    //不保留
+                    isSave = false;
                 }
             }
 
-            if (stage!=null) {
-                if (item.getTitle().equalsIgnoreCase(stage)) {
+            if (stage != null) {
+                if (!item.getTitle().equalsIgnoreCase(stage)) {
                     //保留
-                    isSave = true;
+                    isSave = false;
                 }
             }
 
@@ -146,19 +146,22 @@ public class SweetAppletController {
                 item.setIsWatch(0);
                 item.setIsSign(0);
 
+                if (relationData.getWatchList() != null) {
                     for (String artistsId : relationData.getWatchList()) {
                         if (artistsId.equalsIgnoreCase(item.getArtistId())) {
                             item.setIsWatch(1);
                             break;
                         }
                     }
-
+                }
+                if (relationData.getSignList() != null) {
                     for (String artistsId : relationData.getSignList()) {
                         if (artistsId.equalsIgnoreCase(item.getArtistId())) {
                             item.setIsSign(1);
                             break;
                         }
                     }
+                }
 
                 returnArtist.add(item);
             }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistListDto.java

@@ -17,6 +17,8 @@ public class SweetManualArtistListDto implements Serializable,Cloneable {
     private String artistId;
     @ApiModelProperty("艺人名称")
     private String name;
+    @ApiModelProperty("拼音")
+    private String pinyin;
     @ApiModelProperty("舞台id")
     private String stageId;
     @ApiModelProperty("舞台名称")

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

@@ -85,6 +85,7 @@ public class SweetWechatCallbackServiceImpl {
         if (encType == null) {
             // 明文传输的消息
             WxMpXmlMessage inMessage = WxMpXmlMessage.fromXml(requestBody);
+            log.info("\n消息内容为：\n[{}] ", inMessage.toString());
             WxMpXmlOutMessage outMessage = messageRouter(wxMpService).route(inMessage);
             if (outMessage == null) {
                 return "";

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualArtistsMapper.xml

@@ -6,6 +6,7 @@
         <result column="manual_relation_id" property="manualRelationId"/>
         <result column="artists_id" property="artistId"/>
         <result column="name" property="name"/>
+        <result column="pinyin" property="pinyin"/>
         <result column="stage_id" property="stageId"/>
         <result column="title" property="title"/>
         <result column="performance_start" property="performanceStart"/>
@@ -22,6 +23,7 @@
         select manual_relation_id,
         sa.`artists_id`,
         sa.`name`,
+        sa.pinyin,
         ss.stage_id,
         ss.title,
         performance_start,