Merge branch 'pre' into dev

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -109,7 +109,7 @@
         <result property="classStartTime" column="class_start_time"/>
         <result property="classEndTime" column="class_end_time"/>
 
-        <result property="learningStatus" column="learn_status"/>
+        <result property="learningStatus" column="learning_status"/>
         <result property="classStatus" column="class_status"/>
         <result property="learningTimeStart" column="learning_time_start"/>
         <result property="interfacePushId" column="interface_push_id"/>
@@ -410,7 +410,7 @@
             og.service_end_time,
             cg.class_start_time,
             cg.class_end_time,
-            cgu.learn_status,
+            cg.learning_status,
             cgu.official_status,
             cg.learning_time_start,
             cg.class_status,

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

@@ -54,9 +54,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         any_value ( cpt.project_name ) project_name,
         any_value ( cb.business_name ) business_name,
         (select IFNULL(sum(og.goods_received),0) from order_goods og LEFT JOIN `order` o on o.order_sn = og.order_sn  where o.input_order_sn = u.input_order_sn and og.refund_status = 2) goods_refund,
-        sum( og.goods_received ) goods_received,
-        sum(u.order_price ) order_price,
-        sum(u.pay_price) pay_price,
+        IFNULL(sum( og.goods_received ),0) goods_received,
+        IFNULL(sum(u.order_price ),0) order_price,
+        IFNULL(sum(u.pay_price),0) pay_price,
         any_value ( u.create_username ) create_username,
         any_value ( u.create_time ) create_time FROM (SELECT
         oi.*,
@@ -103,9 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             any_value ( cpt.project_name ) project_name,
             any_value ( cb.business_name ) business_name,
             (select IFNULL(sum(og.goods_received),0) from order_goods og LEFT JOIN `order` o on o.order_sn = og.order_sn  where o.input_order_sn = oi.input_order_sn and og.refund_status = 2) goods_refund,
-            sum( og.goods_received ) goods_received,
-            sum( o.order_price ) order_price,
-            sum( o.pay_price ) pay_price,
+            IFNULL(sum( og.goods_received ),0) goods_received,
+            IFNULL(sum( o.order_price ),0) order_price,
+            IFNULL(sum( o.pay_price ),0) pay_price,
             any_value ( oi.create_username ) create_username,
             any_value ( oi.create_time ) create_time,
             any_value ( oi.project_id ) project_id,