Merge branch 'score_shop'

wzy

2022-10-09 99091a8cbb8e098575c75a7c640b568addbcc29d

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

@@ -12,6 +12,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.servlet.http.HttpSession;
import java.math.BigDecimal;
import java.util.List;

/**
@@ -38,7 +39,7 @@
    */
   public int remove(List<Long> list);

   public int cancelOrder(Long id);
   public void cancelOrder(Long id);
   /**
    * 根据id删除SysOrder
    *
@@ -142,5 +143,7 @@

   List<RankingVo> findApiShopAchieveRanking(SysOrder sysOrder);

   List<RankingVo> findStaffSaleAchieveRanking(SysOrder sysOrder);
   BigDecimal findVipArrearsByVipId(Long vipId);

    List<SysOrder> findByIds(List<Long> orderIds);
}