1、恢复库

2、优化导出

fs-service/src/main/java/com/fs/course/mapper/FsCourseRedPacketLogMapper.java

@@ -113,38 +113,7 @@ public interface FsCourseRedPacketLogMapper
             " order by o.order_id desc  "+
             "</script>"})
     List<FsCourseRedPacketLogListPVO> selectRedPacketLogListVO(@Param("maps") FsCourseRedPacketLogParam param);
-    @Select({"<script> " +
-            "select l.*,v.title,u.nick_name as fsNickName,u.avatar as fsAvatar,u.phone,cu.nick_name company_user_name,c.company_name,qu.qw_user_name,fuc.course_name,u.phone as phoneNumber,cu.dept_id   from fs_course_red_packet_log l  \n" +
-            "left join fs_user_course_video v on v.video_id = l.video_id \n" +
-            "left join fs_user u on u.user_id = l.user_id \n" +
-            "left join fs_user_course fuc on fuc.course_id = l.course_id \n" +
-            "left join company_user cu on cu.user_id=l.company_user_id \n" +
-            "left join company c on c.company_id=cu.company_id \n" +
-            "LEFT JOIN qw_user qu on qu.id= l.qw_user_id  \n" +
-            "where 1=1   " +
-            "<if test = ' maps.userId !=null '> and l.user_id = #{maps.userId} </if>" +
-            "<if test = ' maps.logId !=null '> and l.log_id = #{maps.logId} </if>" +
-            "<if test = ' maps.watchLogId !=null '> and l.watch_log_id = #{maps.watchLogId} </if>" +
-            "<if test = ' maps.companyId !=null '> and l.company_id = #{maps.companyId} </if>" +
-            "<if test = ' maps.companyUserId !=null '> and l.company_user_id = #{maps.companyUserId} </if>" +
-            "<if test = ' maps.companyUserName !=null '> and cu.nick_name  like concat('%', #{maps.companyUserName}, '%') </if>" +
-            "<if test = ' maps.nickName !=null '> and u.nick_name  like concat('%', #{maps.nickName}, '%') </if>" +
-            "<if test = ' maps.courseId !=null '> and l.course_id = #{maps.courseId} </if>" +
-            "<if test = ' maps.videoId !=null '> and l.video_id = #{maps.videoId} </if>" +
-            "<if test = ' maps.periodId !=null '> and l.period_id = #{maps.periodId} </if>" +
-            "<if test = ' maps.status !=null '> and l.status = #{maps.status} </if>" +
-            "<if test = \"maps.phone !=null and maps.phone != '' \"> and u.phone = #{maps.phone} </if>" +
-            "<if test = ' maps.qwUserId !=null '> and l.qw_user_id = #{maps.qwUserId} </if>" +
-            "<if test=\"maps.sTime != null \">  and DATE(l.create_time) &gt;= DATE(#{maps.sTime})</if>\n" +
-            "<if test=\"maps.eTime != null \">  and DATE(l.create_time) &lt;= DATE(#{maps.eTime})</if>\n" +
-            "<if test=\"maps.userIds != null and maps.userIds.size() > 0\">\n" +
-            "                AND l.company_user_id IN\n" +
-            "                <foreach collection=\"maps.userIds\" open=\"(\" close=\")\" separator=\",\" item=\"item\">\n" +
-            "                    ${item}\n" +
-            "                </foreach>\n" +
-            "            </if>" +
-            " order by l.log_id desc  "+
-            "</script>"})
+
     List<FsCourseRedPacketLogListPVO> selectFsCourseRedPacketLogListVO(@Param("maps") FsCourseRedPacketLogParam fsCourseRedPacketLog);
 
     List<FsCourseRedPacketLogListPVO> selectFsCourseRedPacketLogListVOPage(@Param("maps") FsCourseRedPacketLogParam fsCourseRedPacketLog);

fs-service/src/main/resources/application-druid-zkzh-test.yml

@@ -30,7 +30,7 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://47.111.26.148:2345/jz_store_v2_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+                    url: jdbc:mysql://47.111.26.148:2345/jz_store_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
                     username: root
                     password: Zkhj951753@#
                 # 从库数据源

fs-service/src/main/resources/mapper/course/FsCourseRedPacketLogMapper.xml

@@ -435,6 +435,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY l.log_id DESC
     </select>
 
+
+    <select id="selectFsCourseRedPacketLogListVO" resultType="com.fs.course.vo.FsCourseRedPacketLogListPVO">
+        SELECT
+        l.log_id, l.course_id, l.user_id, l.video_id, l.company_user_id, l.company_id,
+        l.amount, l.create_time, l.qw_user_id, l.out_batch_no, l.status, l.update_time,
+        l.watch_log_id, l.remark, l.period_id, l.batch_id, l.app_id,
+        u.nick_name AS fsNickName, u.avatar AS fsAvatar, u.phone,
+        cu.nick_name AS company_user_name, cu.dept_id,
+        (SELECT company_name FROM company WHERE company_id = l.company_id) AS company_name,
+        (SELECT qw_user_name FROM qw_user WHERE id = l.qw_user_id) AS qw_user_name,
+        (SELECT title FROM fs_user_course_video WHERE video_id = l.video_id) AS video_name,
+        (SELECT period_name FROM fs_user_course_period WHERE period_id = l.period_id) AS period_name,
+        (SELECT dept_name FROM company_dept WHERE dept_id = cu.dept_id) AS dept_name,
+        (SELECT course_name FROM fs_user_course WHERE course_id = l.course_id) AS course_name
+        FROM fs_course_red_packet_log l
+        INNER JOIN (
+        SELECT log_id FROM fs_course_red_packet_log
+        <where>
+            <if test="maps.userId != null"> AND user_id = #{maps.userId} </if>
+            <if test="maps.logId != null"> AND log_id = #{maps.logId} </if>
+            <if test="maps.watchLogId != null"> AND watch_log_id = #{maps.watchLogId} </if>
+            <if test="maps.companyId != null"> AND company_id = #{maps.companyId} </if>
+            <if test="maps.companyUserId != null"> AND company_user_id = #{maps.companyUserId} </if>
+            <if test="maps.courseId != null"> AND course_id = #{maps.courseId} </if>
+            <if test="maps.videoId != null"> AND video_id = #{maps.videoId} </if>
+            <if test="maps.periodId != null"> AND period_id = #{maps.periodId} </if>
+            <if test="maps.status != null"> AND status = #{maps.status} </if>
+            <if test="maps.qwUserId != null"> AND qw_user_id = #{maps.qwUserId} </if>
+            <if test="maps.sTime != null"> AND create_time &gt;= #{maps.sTime} </if>
+            <if test="maps.eTime != null"> AND create_time &lt;= #{maps.eTime} </if>
+            <if test="maps.userIdsConverted != null and maps.userIdsConverted.size() > 0">
+                AND company_user_id IN
+                <foreach collection="maps.userIdsConverted" open="(" close=")" separator="," item="item">#{item}</foreach>
+            </if>
+        </where>
+        ORDER BY log_id DESC
+        ) AS t ON t.log_id = l.log_id
+        LEFT JOIN fs_user u ON u.user_id = l.user_id
+        LEFT JOIN company_user cu ON cu.user_id = l.company_user_id
+        <where>
+            <if test="maps.companyUserName != null"> AND cu.nick_name LIKE concat('%', #{maps.companyUserName}, '%') </if>
+            <if test="maps.nickName != null"> AND u.nick_name LIKE concat('%', #{maps.nickName}, '%') </if>
+            <if test="maps.phone != null and maps.phone != ''"> AND u.phone = #{maps.phone} </if>
+        </where>
+        ORDER BY l.log_id DESC
+    </select>
+
+
     <!-- 快速COUNT：仅查主表，不JOIN，走索引 -->
     <select id="selectFsCourseRedPacketLogListVOCount" resultType="long">
         SELECT COUNT(1) FROM fs_course_red_packet_log

fs-user-app/src/main/java/com/fs/app/controller/store/CompanyOrderNewScrmController.java

@@ -29,7 +29,7 @@ public class CompanyOrderNewScrmController extends AppBaseController {
 
     @Login
     @ApiOperation("查询制单收货地址")
-    @GetMapping("/createAddress")
+    @GetMapping("/getAddress")
     public R getAddress(String orderKey){
         return orderService.getAddress(orderKey);
     }