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

yujian

2020-05-13 3b9e1385a90ae84f97f2a4b8b7a35a6b13c01062

 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);

}