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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderCountMapper.xml

@@ -295,10 +295,19 @@
   <select id="countValidOrderByDay" resultMap="CountOrderMap">
      SELECT co_uid AS uid ,totalOrder FROM (
         SELECT COUNT(d.`co_id`) AS totalOrder,d.`co_uid` FROM `yeshi_ec_common_order` d
         WHERE DATE_FORMAT(d.`co_third_create_time`,'%Y-%m-%d') = '2019-11-11'  AND (d.`co_state`=1 OR d.`co_state`=2)  
         WHERE DATE_FORMAT(d.`co_third_create_time`,'%Y-%m-%d') = #{preDay} 
              AND (d.`co_state`=1 OR d.`co_state`=2)  
         GROUP BY d.`co_order_no`,d.`co_source_type`)A
      GROUP BY co_uid
   </select>
	
	
   <select id="getUidByValidOrderByDay"  resultType="Long">
      SELECT DISTINCT d.`co_uid` FROM `yeshi_ec_common_order` d
      WHERE TO_DAYS(co_third_create_time) = TO_DAYS(#{preDay}) AND (d.`co_state`=1 OR d.`co_state`=2)  
      GROUP BY d.`co_order_no`,d.`co_source_type`
   </select>
	
   
   <select id="countDownOrderUserByUidAndDate" resultType="Integer">
      SELECT COUNT(DISTINCT d.`co_uid`) FROM `yeshi_ec_common_order` d
@@ -308,10 +317,19 @@
      </foreach>
   </select>
   
   <select id="getDownOrderUserByListUidAndDate" resultType="Long">
      SELECT  d.`co_uid` FROM `yeshi_ec_common_order` d
      WHERE  d.`co_third_create_time`<![CDATA[<=]]> #{preDay} AND (d.`co_state`=1 OR d.`co_state`=2)  
      <foreach collection="list" item="uid" open="AND (" separator="OR" close=")" >
         d.`co_uid` = #{uid} 
      </foreach>
      GROUP BY d.`co_order_no`,d.`co_source_type`
   </select>
	
   <select id="countCommissionByDay" resultMap="CountOrderMap">
   SELECT co_uid AS uid ,commission FROM (
         SELECT SUM(IFNULL(d.`co_eIncome`,d.`co_estimate`)) AS commission,d.`co_uid` FROM `yeshi_ec_common_order` d
         WHERE DATE_FORMAT(d.`co_third_create_time`,'%Y-%m-%d') = '2019-11-11'  AND (d.`co_state`=1 OR d.`co_state`=2)  
         WHERE DATE_FORMAT(d.`co_third_create_time`,'%Y-%m-%d') = #{preDay}   AND (d.`co_state`=1 OR d.`co_state`=2)  
         GROUP BY d.`co_order_no`,d.`co_source_type`)A
      GROUP BY co_uid
   </select>
@@ -325,7 +343,7 @@
   
   <select id="countCommissionByDate" resultType="BigDecimal">
      SELECT SUM(IFNULL(d.`co_eIncome`,d.`co_estimate`)) FROM `yeshi_ec_common_order` d
      WHERE d.`co_third_create_time`= #{preDay} AND (d.`co_state`=1 OR d.`co_state`=2)  
      WHERE TO_DAYS(d.`co_third_create_time`)= TO_DAYS#{preDay}) AND (d.`co_state`=1 OR d.`co_state`=2)  
   </select>
   
   <select id="countOderByUidAndLess10" resultType="Integer">