Merge remote-tracking branch 'origin/master'

admin

2019-06-27 349fe3ad7dc7295729f5ef98aabd7c3c68a90ce6

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

   }



}