Merge remote-tracking branch 'origin/dev_price' into 20231126-yw

src/main/java/com/glxp/api/service/CustomServiceImpl.java

@@ -6,7 +6,7 @@ import com.glxp.api.dao.BaseMapperPlus;
 
 import java.util.List;
 
-public class CustomServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<BaseMapperPlus<M,T,T>, T>  implements CustomService<T>{
+public class CustomServiceImpl<M extends BaseMapperPlus<M,T,T>, T> extends ServiceImpl<M, T>  implements CustomService<T>{
     @Override
     public int insertIgnore(T entity) {
         return baseMapper.insertIgnore(entity);

src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java

@@ -18,14 +18,12 @@ import java.util.List;
 @Transactional(rollbackFor = Exception.class)
 public class BasicExportTimeServiceImpl extends CustomServiceImpl<BasicExportTimeDao, BasicExportStatusTimeEntity> implements BasicExportTimeService {
 
-    @Resource
-    BasicExportTimeDao basicExportTimeDao;
 
     @Override
     public BasicExportStatusTimeEntity findByType(String type) {
         BasicExportTimeRequest basicExportTimeRequest = new BasicExportTimeRequest();
         basicExportTimeRequest.setKey(type);
-        List<BasicExportStatusTimeEntity> basicExportStatusTimeEntities = basicExportTimeDao.filterExportStatus(basicExportTimeRequest);
+        List<BasicExportStatusTimeEntity> basicExportStatusTimeEntities = super.baseMapper.filterExportStatus(basicExportTimeRequest);
         if (CollUtil.isNotEmpty(basicExportStatusTimeEntities)) {
             return basicExportStatusTimeEntities.get(0);
         }
@@ -41,23 +39,23 @@ public class BasicExportTimeServiceImpl extends CustomServiceImpl<BasicExportTim
         if (basicExportStatusRequest == null) {
             return Collections.emptyList();
         }
-        return basicExportTimeDao.filterExportStatus(basicExportStatusRequest);
+        return super.baseMapper.filterExportStatus(basicExportStatusRequest);
     }
 
     @Override
     public boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
-        return basicExportTimeDao.insertExportStatus(basicExportStatusTimeEntity);
+        return super.baseMapper.insertExportStatus(basicExportStatusTimeEntity);
 
     }
 
     @Override
     public boolean deleteById(String id) {
-        return basicExportTimeDao.deleteById(id);
+        return super.baseMapper.deleteById(id);
     }
 
     @Override
     public boolean updateExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity) {
-        return basicExportTimeDao.updateExportStatus(basicExportStatusTimeEntity);
+        return super.baseMapper.updateExportStatus(basicExportStatusTimeEntity);
 
     }
 }