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

admin

2020-04-26 91d0826fffcc79d5869b15fffe4392399d23f0b1

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

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

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

}