Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 ae3e722d471d7e844acd25f124a1fec42ac714a0

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

@@ -63,4 +63,9 @@
      return hongBaoOrderMapper.countByOrderNoAndHongBaoType(orderNo, type, Constant.SOURCE_TYPE_TAOBAO);

   }



   @Override

   public HongBaoOrder selectDetailByCommonOrderId(Long commonOrderId) {

      return hongBaoOrderMapper.selectByCommonOrderId(commonOrderId);

   }



}