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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/jd/JDOrderItemMapper.java

@@ -1,38 +1,57 @@
package com.yeshi.fanli.dao.mybatis.jd;

import java.util.List;
import java.util.Map;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.jd.JDOrderItem;

public interface JDOrderItemMapper extends BaseMapper<JDOrderItem> {

   /**
    * 根据交易ID查询
    * 
    * @param tradeId
    * @return
    */
   JDOrderItem selectByTradeId(String tradeId);

   /**
    * 根据订单号查询
    * 
    * @param orderId
    * @return
    */
   List<JDOrderItem> listByOrderId(Long orderId);

   /**
    * 统计所有订单
    * 
    * @param channel
    * @return
    */
   List<Map<String, Object>> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
         @Param("startTime") String startTime, @Param("endTime") String endTime);

package com.yeshi.fanli.dao.mybatis.jd;



import java.util.List;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

import com.yeshi.fanli.dto.ChartTDO;

import com.yeshi.fanli.entity.jd.JDOrderItem;



public interface JDOrderItemMapper extends BaseMapper<JDOrderItem> {



   /**

    * 根据交易ID查询

    * 
    * @param tradeId

    * @return

    */

   JDOrderItem selectByTradeId(String tradeId);



   /**

    * 根据订单号查询

    * 
    * @param orderId

    * @return

    */

   List<JDOrderItem> listByOrderId(Long orderId);



   /**

    * 统计所有订单

    * 
    * @param channel

    * @return

    */

   Long countOrderByDay(@Param("preDay") String preDay);

	
   /**

    * 统计所有订单

    * 
    * @param channel

    * @return

    */

   List<ChartTDO> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,

         @Param("startTime") String startTime, @Param("endTime") String endTime);



	
   /**

    * 查询所有订单

    * 
    * @param channel

    * @return

    */

   List<JDOrderItem> listQuery(@Param("start") long start, @Param("count")int count, @Param("key")String key);



   Long countQuery(@Param("key")String key);



}