Merge branch 'master-order-statistics' into dev

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml

@@ -43,12 +43,12 @@
             resultMap="order">
     SELECT
     <if test="type==2">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v') AS period,
+        DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%v') AS period,
     </if>
     <if test="type==3">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m') AS period,
+        DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%m') AS period,
     </if>
-	date( FROM_UNIXTIME( a.crt_time / 1000 ) ) AS period,
+	date( FROM_UNIXTIME( a.account_time / 1000 ) ) AS period,
 	count( a.id ) AS number,
 	SUM( a.account_amount ) AS amount,
 	d.member_level AS level
@@ -68,13 +68,13 @@
     </if>
     GROUP BY
     <if test="type==2">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v'),
+        DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%v'),
     </if>
     <if test="type==3">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m'),
+        DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%m'),
     </if>
 
-	date( FROM_UNIXTIME( a.crt_time / 1000 ) ),
+	date( FROM_UNIXTIME( a.account_time / 1000 ) ),
 	d.member_level
     </select>
     <resultMap id="order" type="com.xxfc.platform.order.entity.MembersOrder">