Merge branch 'dev-hongbao'

admin

2019-01-03 5981b2cae7c20ec9021c8ccbe1a926f35f640210

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java

@@ -81,7 +81,20 @@
    */
   BigDecimal countBonusOrderMoney(@Param("uid") Long uid, @Param("type") Integer type, @Param("day") Integer day);
   
	
   int countByOrderNOAndOrderType(@Param("orderNO") String orderNO, @Param("orderType") int orderType);

   /**
    * 根据订单号与订单排序值获取详情
    * 
    * @param orderNo
    *            -订单号
    * @param orderBy
    *            -订单排序值
    * @param orderType
    *            -订单类型
    * @return
    */
   CommonOrder selectByOrderNoAndOrderTypeAndOrderBy(@Param("orderNo") String orderNo,
         @Param("orderType") int orderType, @Param("orderBy") int orderBy);

}