合并冲突修复

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -84,9 +84,6 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     List<OrderGoods> getOrderGoodsListByOrderNoAndStatus(String orderNo);
 
-    List<OrderGoodsAPPVO> getCancelOrderGoods(List<OrderGoodsTruckBind> list);
-
-
     void updateSendSystemAddress(Integer ownerAddressId, Integer systemAddressId);
     void updateReceiveSystemAddress(Integer ownerAddressId, Integer systemAddressId);
     List<OrderGoodsAPPVO> getCancelOrderGoods(List<String> list);

performance-web/src/main/java/com/clx/performance/dao/impl/IntegralRecordDaoImpl.java

@@ -49,11 +49,6 @@ public class IntegralRecordDaoImpl extends BaseDaoImpl<IntegraRecordMapper, Inte
         return baseMapper.sumByStatisticsIdAndTypes(statisticsId, typeList);
     }
 
-    @Override
-    public int sumByStatisticsIdAndTypes(Integer statisticsId, List<Integer> typeList) {
-        return baseMapper.sumByStatisticsIdAndTypes(statisticsId, typeList);
-    }
-
     @Override
     public Integer sumByStatisticsIdAndTypeAndTime(Integer statisticsId, Integer type, String beginTime, String endTime) {
         return baseMapper.sumByStatisticsIdAndTypeAndTime(statisticsId, type, beginTime, endTime);

performance-web/src/main/java/com/clx/performance/mapper/IntegraRecordMapper.java

@@ -42,12 +42,6 @@ public interface IntegraRecordMapper extends BaseMapper<IntegralRecord> {
                                         @Param("beginTime")String beginTime,
                                         @Param("endTime")String endTime);
 
-    @Select("<script>select sum(integral) from integral_record where " +
-            " type in <foreach collection='list' item='item' open='(' separator=',' close=')'>#{item}</foreach> " +
-            " and statistics_id = #{statisticsId}" +
-            "</script>")
-    int sumByStatisticsIdAndTypes(@Param("statisticsId") Integer statisticsId, @Param("list") List<Integer> typeList);
-
     @Select("select count(1) from integral_record where statistics_id = #{statisticsId} and type = #{type} and create_time >= #{beginTime} and create_time < #{endTime}")
     Integer countByStatisticsIdAndTypeAndTime(@Param("statisticsId") Integer statisticsId,
                                         @Param("type") Integer type,