Merge remote-tracking branch 'origin/div' into div

yj

2020-03-13 1da0cccd804b441ac94a35f28a2ed23a6a7062cc

 fanli/src/main/java/com/yeshi/fanli/mapping/jd/JDOrderItemMapper.xml

@@ -281,4 +281,14 @@
      WHERE joi_valid_code!=2 AND FROM_UNIXTIME(jo_order_time/1000,'%Y-%m-%d')=#{preDay}

   </select>

   

		
   <select id="countOrderNumber" resultMap="ChartMap">

      SELECT IFNULL(COUNT(`joi_id`),0) AS showValue,

      <include refid="Column_DateType" />

      FROM `yeshi_ec_jd_order_item` left join yeshi_ec_jd_order on jo_order_id=joi_order_id  WHERE jo_order_time IS NOT NULL and joi_valid_code!=2

      <include refid="Count_Select_DateType" />

      <include refid="Count_Group_DateType" />

      ORDER BY jo_order_time

   </select>

	
</mapper>