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

admin

2020-04-28 3937985da1ce712df86d546ced42f7a21feada94

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -2177,4 +2177,15 @@
         order.setRewardDetail(rewardMap);
      }
   }
	
	
   @Override
   public long countOrderByUidAndSettled(Long uid, BigDecimal payment) {
      Long count = commonOrderMapper.countOrderByUidAndSettled(uid, payment);
      if (count == null) {
         count = 0L;
      }
      return count;
   }
	
}