sweet

liquidnet-bus-config/liquidnet-config/liquidnet-service-sweet.yml

@@ -69,7 +69,7 @@ spring:
   profiles:
     include: common-service #这里加载management相关公共配置
   redis:
-    database: 9
+    database: 15
     port: ${liquidnet.redis.port}
     host: ${liquidnet.redis.host}
     password: ${liquidnet.redis.password}

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

@@ -33,7 +33,7 @@ public class SweetAppletController {
     })
     public ResponseDto<List<SweetManualAppletDto>> timeSelect(@RequestParam String name) {
         List<SweetManualAppletDto> dto = redisDataUtils.getPushList();
-        List<SweetManualAppletDto> vo = redisDataUtils.getPushList();
+        List<SweetManualAppletDto> vo = new ArrayList<>();
         for (SweetManualAppletDto item : dto) {
             if (item.getTitle().contains(name)) {
                 vo.add(item);

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

@@ -25,6 +25,15 @@
         <result column="time_end" property="timeEnd"/>
     </resultMap>
 
+    <resultMap id="getManualAppletDtoResult" type="com.liquidnet.service.sweet.dto.SweetManualAppletDto">
+        <result column="manual_id" property="manualId"/>
+        <result column="performances_id" property="performancesId"/>
+        <result column="title" property="title"/>
+        <result column="field_id" property="fieldId"/>
+        <result column="time_start" property="timeStart"/>
+        <result column="time_end" property="timeEnd"/>
+    </resultMap>
+
     <!-- 电子手册列表 -->
     <select id="getManualList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
         SELECT
@@ -113,4 +122,37 @@
         where sw.`status` = 1
           and sw.is_release = 1
     </select>
+
+    <select id="getManualAppletDto" resultMap="getManualAppletDtoResult">
+        SELECT
+            IFNULL(sm.manual_id , 0) AS 'manual_id' ,
+            p.performances_id ,
+            p.title ,
+            pr.field_id ,
+            p.time_start ,
+            p.time_end
+        FROM
+            kylin_performances AS p
+                LEFT JOIN kylin_performance_status AS ps ON p.performances_id = ps.performance_id
+                LEFT JOIN kylin_performance_relations AS pr ON p.performances_id = pr.performance_id
+                LEFT JOIN sweet_manual AS sm ON p.performances_id = sm.performance_id
+                LEFT JOIN(
+                SELECT
+                    ttr.performance_id ,
+                    MIN(
+                            DATE_SUB(
+                                    t.time_start ,
+                                    INTERVAL pay_countdown_minute MINUTE
+                                )
+                        ) AS 'time_sell' ,
+                    MAX(t.time_end) AS 'time_stop'
+                FROM
+                    kylin_ticket_status AS ts
+                        LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = ts.ticket_id
+                        LEFT JOIN kylin_tickets AS t ON t.tickets_id = ts.ticket_id
+                        LEFT JOIN kylin_ticket_time_relation AS ttr ON tr.times_id = ttr.times_id
+                GROUP BY
+                    ttr.performance_id
+            ) AS t ON p.performances_id = t.performance_id where sm.`status` = 1 and sm.is_release = 1
+    </select>
 </mapper>