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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java

@@ -425,4 +425,19 @@
    */
   public BigDecimal getWeiQuanMoney(List<TaoBaoWeiQuanOrder> listWQ, int sourceType, Long uid);

	
   /**
    * 统计订单记录数量-非订单号为主
    * @param uid
    * @param payment
    * @return
    */
   public long countOrderByUidAndSettled(Long uid, BigDecimal payment);

   /**
    * 获取最新的淘宝订单号
    * @return
    */
   public String getNewestOrderNoByTaoBao();

}