MERGE

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -693,10 +693,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 itemImport.setTelphone(user2.getTelphone());
                 successList.add(itemImport);
                 //如果学员公司信息不一样则更新公司信息
-                if (StringUtils.isNotBlank(itemImport.getCompanyName()) &&
-                        (StringUtils.isBlank(user.getCompanyName()) || !user.getCompanyName().equals(itemImport.getCompanyName()))){
-                    user.setCompanyName(itemImport.getCompanyName());
-                    updateById(user);
+                if (Validator.isNotEmpty(itemImport.getCompanyName())&&!itemImport.getCompanyName().equals(user2.getCompanyName())){
+                    user2.setCompanyName(itemImport.getCompanyName());
+                    updateById(user2);
                 }
                 continue;
             }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -522,95 +522,88 @@
 			and mmsg.mock_major_subject_id = #{mockMajorSubjectId}
     </select>
     <select id="getLiveList" parameterType="java.lang.Long" resultType="com.zhongzheng.modules.course.vo.CourseLiveVo">
-        SELECT *
-        FROM course_section
-        WHERE section_id IN (
-            SELECT a.section_id
-            FROM (
-                     SELECT gc.course_id      AS courseId,
-                            og.order_goods_id AS orderGoodId,
-                            g.goods_id        AS goodsId,
-                            cm.menu_id        AS chapterId,
-                            ''                AS moduleId,
-                            ct.*
-                     FROM `order` o
-                              LEFT JOIN order_goods og ON o.order_sn = og.order_sn
-                              LEFT JOIN goods g ON og.goods_id = g.goods_id
-                              INNER JOIN goods_course gc ON g.goods_id = gc.goods_id
-                              LEFT JOIN course_menu cm ON gc.course_id = cm.course_id
-                              LEFT JOIN course_chapter_section cs ON cm.menu_id = cs.chapter_id
-                              LEFT JOIN course_section ct ON cs.section_id = ct.section_id
-                     WHERE o.user_id = #{userId}
-                       AND o.order_status = 1
-                       AND og.pay_status IN (2, 3, 4)
-                       AND og.refund_status != 2
-			           AND og.STATUS = 1
-			           AND o.`status` = 1
-			           AND g.`status` = 1
-			           AND cm.type = 2
-			           AND ct.section_type = 2
-                     UNION
-                     SELECT
-                         gc.course_id AS courseId,
-                         og.order_goods_id AS orderGoodId,
-                         g.goods_id AS goodsId,
-                         '' AS chapterId,
-                         '' AS moduleId,
-                         ct.*
-                     FROM
-                         `order` o
-                         LEFT JOIN order_goods og
-                     ON o.order_sn = og.order_sn
-                         LEFT JOIN goods g ON og.goods_id = g.goods_id
-                         INNER JOIN goods_course gc ON g.goods_id = gc.goods_id
-                         LEFT JOIN course_menu cm ON gc.course_id = cm.course_id
-                         LEFT JOIN course_section ct ON cm.menu_id = ct.section_id
-                     WHERE
-                         o.user_id = #{userId}
-                       AND o.order_status = 1
-                       AND og.pay_status IN ( 2
-                         , 3
-                         , 4 )
-                       AND og.refund_status != 2
-                       AND og.STATUS = 1
-                       AND o.`status` = 1
-                       AND g.`status` = 1
-                       AND cm.type = 3
-                       AND ct.section_type = 2
-                     UNION
-                     SELECT
-                         gc.course_id AS courseId,
-                         og.order_goods_id AS orderGoodId,
-                         g.goods_id AS goodsId,
-                         cmc.chapter_id AS chapterId,
-                         cmc.module_id AS moduleId,
-                         ct.*
-                     FROM
-                         `order` o
-                         LEFT JOIN order_goods og
-                     ON o.order_sn = og.order_sn
-                         LEFT JOIN goods g ON og.goods_id = g.goods_id
-                         INNER JOIN goods_course gc ON g.goods_id = gc.goods_id
-                         LEFT JOIN course_menu cm ON gc.course_id = cm.course_id
-                         LEFT JOIN course_module_chapter cmc ON cm.menu_id = cmc.module_id
-                         LEFT JOIN course_chapter_section ccs ON cmc.chapter_id = ccs.chapter_id
-                         LEFT JOIN course_section ct ON ccs.section_id = ct.section_id
-                     WHERE
-                         o.user_id = #{userId}
-                       AND o.order_status = 1
-                       AND og.pay_status IN ( 2
-                         , 3
-                         , 4 )
-                       AND og.refund_status != 2
-                       AND og.STATUS = 1
-                       AND o.`status` = 1
-                       AND g.`status` = 1
-                       AND cm.type = 1
-                       AND ct.section_type = 2
-                 ) a
-            GROUP BY a.section_id
-        )
-        ORDER BY live_start_time ASC
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    gc.course_id AS courseId,
+                    og.order_goods_id AS orderGoodId,
+                    g.goods_id AS goodId,
+                    cm.menu_id AS chapterId,
+                    '' AS moduleId,
+                    ct.*
+                FROM
+                    `order` o
+                        LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+                        LEFT JOIN goods g ON og.goods_id = g.goods_id
+                        INNER JOIN goods_course gc ON g.goods_id = gc.goods_id
+                        LEFT JOIN course_menu cm ON gc.course_id = cm.course_id
+                        LEFT JOIN course_chapter_section cs ON cm.menu_id = cs.chapter_id
+                        LEFT JOIN course_section ct ON cs.section_id = ct.section_id
+                WHERE
+                    o.user_id = #{userId}
+                  AND og.pay_status IN ( 2, 3, 4 )
+                  AND og.refund_status != 2
+		          AND og.STATUS = 1
+		          AND o.`status` = 1
+		          AND g.`status` = 1
+		          AND g.goods_type = 6
+		          AND cm.type = 2
+		          AND ct.section_type = 2 UNION ALL
+                SELECT
+                    gc.course_id AS courseId,
+                    og.order_goods_id AS orderGoodId,
+                    g.goods_id AS goodId,
+                    '' AS chapterId,
+                    '' AS moduleId,
+                    ct.*
+                FROM
+                    `order` o
+                    LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+                    LEFT JOIN goods g ON og.goods_id = g.goods_id
+                    INNER JOIN goods_course gc ON g.goods_id = gc.goods_id
+                    LEFT JOIN course_menu cm ON gc.course_id = cm.course_id
+                    LEFT JOIN course_section ct ON cm.menu_id = ct.section_id
+                WHERE
+                    o.user_id = #{userId}
+                  AND og.pay_status IN ( 2, 3, 4 )
+                  AND og.refund_status != 2
+                  AND og.STATUS = 1
+                  AND o.`status` = 1
+                  AND g.`status` = 1
+                  AND g.goods_type = 6
+                  AND cm.type = 3
+                  AND ct.section_type = 2 UNION ALL
+                SELECT
+                    gc.course_id AS courseId,
+                    og.order_goods_id AS orderGoodId,
+                    g.goods_id AS goodId,
+                    cmc.chapter_id AS chapterId,
+                    cmc.module_id AS moduleId,
+                    ct.*
+                FROM
+                    `order` o
+                    LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+                    LEFT JOIN goods g ON og.goods_id = g.goods_id
+                    INNER JOIN goods_course gc ON g.goods_id = gc.goods_id
+                    LEFT JOIN course_menu cm ON gc.course_id = cm.course_id
+                    LEFT JOIN course_module_chapter cmc ON cm.menu_id = cmc.module_id
+                    LEFT JOIN course_chapter_section ccs ON cmc.chapter_id = ccs.chapter_id
+                    LEFT JOIN course_section ct ON ccs.section_id = ct.section_id
+                WHERE
+                    o.user_id = #{userId}
+                  AND og.pay_status IN ( 2, 3, 4 )
+                  AND og.refund_status != 2
+                  AND og.STATUS = 1
+                  AND o.`status` = 1
+                  AND g.`status` = 1
+                  AND g.goods_type = 6
+                  AND cm.type = 1
+                  AND ct.section_type = 2
+            ) a
+        ORDER BY
+            a.live_start_time ASC
     </select>
 
     <select id="getBuyNotStudyList" parameterType="com.zhongzheng.modules.order.bo.OrderQueryBo" resultMap="OrderGoodsResultVo">