Merge branch 'master' of http://192.168.20.122:3000/root/qiyewechatApp

ymall/src/main/resources/mapper/CalculationProfitMapper.xml

@@ -149,7 +149,7 @@
 
   <select id="getNotRecordProfit" resultMap="baseMap">
     select  *  from  calculation_profit
-    where status = 2  and ((type=1 and date_part('day', #{now}::TIMESTAMP - syn_order_time) >= 1)
+    where status = 2  and ((type=1 and date_part('day', #{now}::TIMESTAMP - syn_order_time) >= 8)
     or (type =2 and date_part('day' , #{now}::TIMESTAMP - syn_order_time) >=8) )
     order by syn_order_time asc limit 3000
   </select>