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

jyy

2021-01-28 e04735fb7d9cf321f262a1d5338adc92d4856bc0

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

}