Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-02-05 1e1282e8ed0385a1bc88d82dbd9bbcf5d1d22ece

 zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java

@@ -84,6 +84,8 @@
    */
   public void updateReceiptMoney(SysOrder sysOrder) throws GlobleException;

   public void refundOrderMoney(SysOrder sysOrder);

   /**
    * 创建订单
    * @param session
@@ -139,4 +141,5 @@
   OrderDetailVo findApiOrderDetailByOrderId(Long orderId);

   List<RankingVo> findApiShopAchieveRanking(SysOrder sysOrder);

}