fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderItemDao.java

@@ -1,7 +1,9 @@
package com.matrix.system.hive.dao;

import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.vo.OrderDetailItemVo;
import com.matrix.system.hive.bean.SysOrderItem;
import com.matrix.system.shopXcx.api.vo.ErpOrderDetailItemVo;
import org.apache.ibatis.annotations.Param;

import java.util.Date;
@@ -44,7 +46,7 @@
    */
   public List<SysOrderItem> selectByOrderId(@Param("orderId") Long orderId);

   public Integer selectByGoodsId(@Param("goodsId") Long goodsId);
   public Integer selectByGoodsId(@Param("goodsId") Long goodsId,@Param("vipId") Long vipId);

   public List<SysOrderItem> selectItemByTime(@Param("shopId")Long shopId, @Param("time")Date time);

@@ -58,4 +60,10 @@


   public int   deleteByOrderId(Long id);

   List<OrderDetailItemVo> selectApiOrderDetailItemsByOrderId(@Param("orderId") Long orderId);

    List<ErpOrderDetailItemVo> selectErpOrderItemByOrderId(String orderId);

   List<SysOrderItem> selectDgd();
}