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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -409,4 +409,18 @@
         @Param("listSource") List<Integer> listSource);
   

   /**
    * 统计已结算且付款金额大于1的订单（不区分订单状态）
    * @param uid
    * @param payment
    * @return
    */
   Long countOrderByUidAndSettled(@Param("uid") Long uid, @Param("payment") BigDecimal payment);
	
   /**
    * 获取最新的淘宝订单号
    * @return
    */
   String getNewestOrderNoByTaoBao();
	
}