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

admin

2019-08-05 c6d25a24869db9cd4532c2b79c1356939249c634

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

@@ -57,4 +57,14 @@
      return count == null ? 0 : count;

   }



   @Override

   public long countByOrderNoAndHongBaoType(String orderNo, int hongBaotype, int sourceType) {

      return hongBaoOrderMapper.countByOrderNoAndHongBaoType(orderNo, hongBaotype, sourceType);

   }



   @Override

   public HongBaoOrder selectDetailByCommonOrderId(Long commonOrderId) {

      return hongBaoOrderMapper.selectByCommonOrderId(commonOrderId);

   }



}